Merge pull request #49 from RaulPPelaez/cudatorch

Constrain CUDA version to pytorch cuda
conda-forge · Feb 2, 2024 · fbc54fa · fbc54fa
2 parents f6bdeb1 + cb96b13
commit fbc54fa
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 119 deletions.
diff --git a/.ci_support/migrations/cuda118.yaml b/.ci_support/migrations/cuda118.yaml
diff --git a/.ci_support/migrations/pytorch21.yaml b/.ci_support/migrations/pytorch21.yaml
diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -21,7 +21,7 @@ source:
     - 0001-Fix-paths.patch
     - 0002-Cpp17.patch
 build:
-  number: 2
+  number: 3
   string: cuda{{ cuda_compiler_version | replace('.', '') }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}  # [cuda_compiler_version != "None"]
   string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}  # [cuda_compiler_version == "None"]
   skip: true  # [win]
@@ -35,7 +35,7 @@ requirements:
     - python                                 # [build_platform != target_platform]
     - cross-python_{{ target_platform }}     # [build_platform != target_platform]
     - numpy >=1.19                           # [build_platform != target_platform]
-    - swig <4.1                              # [build_platform != target_platform]
+    - swig                                   # [build_platform != target_platform]
     - pytorch                                # [build_platform != target_platform]
     - pytorch =*={{ torch_proc_type }}*      # [build_platform != target_platform]
     - openmm >=8.0.0                         # [build_platform != target_platform]
@@ -48,12 +48,13 @@ requirements:
     - cuda-nvrtc-dev
     - libcufft-dev
     {% endif %}
+    - cuda-version =={{ cuda_compiler_version }}  # [cuda_compiler_version not in (undefined, 'None')]
     - cmake
     - make
   host:
     - python
     - pip
-    - swig <4.1
+    - swig
     - openmm >=8.0.0
     - ocl-icd  # [linux]
     - khronos-opencl-icd-loader  # [osx]
@@ -62,6 +63,7 @@ requirements:
     # The second gets the processor type
     - pytorch
     - pytorch =*={{ torch_proc_type }}*
+    - cuda-version =={{ cuda_compiler_version }}  # [cuda_compiler_version not in (undefined, 'None')]
     {% if cuda_major >= 12 %}
     - cuda-driver-dev
     - cuda-cudart-dev
@@ -79,7 +81,7 @@ requirements:
     - ocl-icd-system  # [linux]
     - khronos-opencl-icd-loader  # [osx]
     - ocl_icd_wrapper_apple      # [osx]
-  #run_constrained:
+  run_constrained:
     # 2022/02/05 hmaarrfk
     # While conda packaging seems to allow us to specify
     # constraints on the same package in different lines
@@ -89,7 +91,7 @@ requirements:
     # we add the GPU constraint in the run_constrained
     # to allow us to have "two" constraints on the
     # running package
-    #- pytorch =*={{ torch_proc_type }}*
+    - pytorch =*={{ torch_proc_type }}*
 
 test:
   imports: