Merge pull request conda-forge#244 from conda-forge-admin/conda_forge…

…_admin_243 Adjust OSX builds to avoid co-installed incompatible versions of OpenMP
jeongseok-meta · Jun 26, 2024 · b362c03 · b362c03
2 parents 437d51a + b825e98
commit b362c03
Show file tree

Hide file tree

Showing 27 changed files with 46 additions and 40 deletions.
diff --git a/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
@@ -11,7 +11,7 @@ c_stdlib_version:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
@@ -15,7 +15,7 @@ cdt_arch:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
@@ -15,7 +15,7 @@ cdt_arch:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_64_blas_implgenericnumpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy1.22python3.8.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '10.15'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '10.15'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '10.15'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '10.15'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '10.15'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy1.22python3.8.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '10.15'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '10.15'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '10.15'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '10.15'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '10.15'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '11.0'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '11.0'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '11.0'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '11.0'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml
@@ -13,7 +13,7 @@ c_stdlib:
 c_stdlib_version:
 - '11.0'
 channel_sources:
-- conda-forge/label/numpy_rc,conda-forge
+- conda-forge
 channel_targets:
 - conda-forge main
 cuda_compiler:

diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -72,7 +72,7 @@ jobs:
     steps:
 
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
 
     - name: Build on Linux
       if: matrix.os == 'ubuntu'
@@ -126,7 +126,7 @@ jobs:
         ./.scripts/run_osx_build.sh
 
     - name: Install Miniconda for windows
-      uses: conda-incubator/setup-miniconda@v3
+      uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
       with:
         miniforge-version: latest
         miniforge-variant: Mambaforge

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -2,6 +2,10 @@
 
 set -ex
 
+# https://github.com/conda-forge/pytorch-cpu-feedstock/issues/243
+# https://github.com/pytorch/pytorch/blob/v2.3.1/setup.py#L341
+export PACKAGE_TYPE=conda
+
 # remove pyproject.toml to avoid installing deps from pip
 rm -rf pyproject.toml
 

diff --git a/recipe/build_pytorch.sh b/recipe/build_pytorch.sh
@@ -1,15 +1,17 @@
 set -x
-if [[ "$megabuild" == true ]]; then
-  source $RECIPE_DIR/build.sh
-  # if $SP_DIR/torch doesn't exist here, the installation
-  # of pytorch (see build_libtorch.sh call above) failed
-  pushd $SP_DIR/torch
-  for f in bin/* lib/* share/* include/*; do
-    if [[ -e "$PREFIX/$f" ]]; then
-      rm -rf $f
-      ln -sf $PREFIX/$f $PWD/$f
-    fi
-  done
-else
-  $PREFIX/bin/python -m pip install --no-deps --no-cache-dir torch-*.whl
-fi
+source $RECIPE_DIR/build.sh
+
+# if $SP_DIR/torch doesn't exist here, the installation
+# of pytorch (see build_libtorch.sh call above) failed
+pushd $SP_DIR/torch
+
+# Make symlinks for libraries and headers from libtorch into $SP_DIR/torch
+# Also remove the vendorered libraries they seem to include
+# https://github.com/conda-forge/pytorch-cpu-feedstock/issues/243
+# https://github.com/pytorch/pytorch/blob/v2.3.1/setup.py#L341
+for f in bin/* lib/* share/* include/*; do
+  if [[ -e "$PREFIX/$f" ]]; then
+    rm -rf $f
+    ln -sf $PREFIX/$f $PWD/$f
+  fi
+done
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set version = "2.3.1" %}
-{% set build = 0 %}
+{% set build = 1 %}
 
 {% if cuda_compiler_version != "None" %}
 {% set build = build + 200 %}