Merge pull request #920 from martindemko/master

Enabling of all Alphafold versions to run with GPU for pulsar-cz
usegalaxy-eu · Oct 2, 2023 · 465d368 · 465d368
2 parents 6301076 + 9c8a741
commit 465d368
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/files/galaxy/tpv/destinations.yml.j2 b/files/galaxy/tpv/destinations.yml.j2
@@ -286,9 +286,7 @@ destinations:
       - if: tool.id.startswith("toolshed.g2.bx.psu.edu/repos/galaxy-australia/alphafold2/alphafold") and helpers.tool_version_gte(tool, "2.1.2+galaxy0") and helpers.tool_version_lt(tool, "2.3")
         env:
           ALPHAFOLD_DB: "/storage/brno11-elixir/projects/alphafold/alphafold.db-2.2"
-        params:
-          singularity_volumes: "$job_directory:ro,$tool_directory:ro,$job_directory/outputs:rw,$working_directory:rw,/cvmfs/data.galaxyproject.org:ro,$SCRATCHDIR,/storage/praha5-elixir/home/galaxyeu:/home/galaxyeu,$ALPHAFOLD_DB:/data/db/databases/alphafold_databases/2.2:ro"
-      - if: tool.id.startswith("toolshed.g2.bx.psu.edu/repos/galaxy-australia/alphafold2/alphafold") and helpers.tool_version_gte(tool, "2.3")
+      - if: tool.id.startswith("toolshed.g2.bx.psu.edu/repos/galaxy-australia/alphafold2/alphafold") and helpers.tool_version_gte(tool, "2.3.1+galaxy2")
         params:
           singularity_volumes: "$job_directory:ro,$tool_directory:ro,$job_directory/outputs:rw,$working_directory:rw,/cvmfs/data.galaxyproject.org:ro,$SCRATCHDIR,/storage/praha5-elixir/home/galaxyeu:/home/galaxyeu,$ALPHAFOLD_DB:/data/2.3:ro"
 

diff --git a/files/galaxy/tpv/tools.yml b/files/galaxy/tpv/tools.yml
@@ -269,10 +269,7 @@ tools:
         mem: 69
       - id: cz-pulsar_alphafold
         if: |
-          (
-              "cz-pulsar" in {tag.value for tag in entity.tpv_tags.tags}
-              and helpers.tool_version_gte(tool, '2.3.1')
-          )
+          "cz-pulsar" in {tag.value for tag in entity.tpv_tags.tags}
         gpus: 1
     scheduling:
       require: