| osx_64_blas_implgenericnumpy1.22python3.10.____cpython |
diff --git a/build-locally.py b/build-locally.py
index 3f4b7a79..e0d408d0 100755
--- a/build-locally.py
+++ b/build-locally.py
@@ -64,8 +64,9 @@ def verify_config(ns):
elif ns.config.startswith("osx"):
if "OSX_SDK_DIR" not in os.environ:
raise RuntimeError(
- "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' "
- "to download the SDK automatically to 'SDKs/MacOSX.sdk'. "
+ "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' "
+ "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. "
+ "Note: OSX_SDK_DIR must be set to an absolute path. "
"Setting this variable implies agreement to the licensing terms of the SDK by Apple."
)
diff --git a/recipe/build.sh b/recipe/build.sh
index ad92fe95..3f6bf169 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -123,6 +123,13 @@ elif [[ ${cuda_compiler_version} != "None" ]]; then
# with no NVIDIA GPUs. However compilation fails with mkldnn and cuda enabled.
export USE_MKLDNN=OFF
export USE_CUDA=1
+ # PyTorch Vendors an old version of FindCUDA
+ # https://gitlab.kitware.com/cmake/cmake/-/blame/master/Modules/FindCUDA.cmake#L891
+ # They are working on updating it pytorch/pytorch#76082
+ # See: https://github.com/conda-forge/pytorch-cpu-feedstock/pull/224#discussion_r1522698939
+ if [[ "${target_platform}" != "${build_platform}" ]]; then
+ export CUDA_TOOLKIT_ROOT=${CUDA_HOME}
+ fi
if [[ ${cuda_compiler_version} == 9.0* ]]; then
export TORCH_CUDA_ARCH_LIST="3.5;5.0;6.0;7.0+PTX"
export CUDA_TOOLKIT_ROOT_DIR=$CUDA_HOME
@@ -148,6 +155,9 @@ elif [[ ${cuda_compiler_version} != "None" ]]; then
export TORCH_CUDA_ARCH_LIST="5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9;9.0+PTX"
# $CUDA_HOME not set in CUDA 12.0. Using $PREFIX
export CUDA_TOOLKIT_ROOT_DIR="${PREFIX}"
+ if [[ "${target_platform}" != "${build_platform}" ]]; then
+ export CUDA_TOOLKIT_ROOT=${PREFIX}
+ fi
else
echo "unsupported cuda version. edit build_pytorch.sh"
exit 1
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 81a68e5e..b978d6b2 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,5 +1,5 @@
{% set version = "2.1.2" %}
-{% set build = 2 %}
+{% set build = 3 %}
{% if cuda_compiler_version != "None" %}
{% set build = build + 200 %}
@@ -29,11 +29,13 @@ source:
# https://github.com/conda-forge/pytorch-cpu-feedstock/pull/203#issuecomment-1797352452
# https://github.com/pytorch/pytorch/pull/82695/files#diff-8e5cb190cc46be808993381a31fe9c027705d356b6bc0460368c0310ae82b273R61-R66
# https://github.com/pytorch/pytorch/pull/108932
- - patches/0001-Allow-splayed-layouts.patch # [cuda_compiler_version == "12.0"]
+ # cross compiling CUDA also needs to delete the check
+ - patches/0001-Allow-splayed-layouts.patch # [cuda_compiler_version == "12.0" or (build_platform != target_platform and cuda_compiler_version != "None")]
# https://github.com/pytorch/pytorch/issues/101135
# the following patch was transcribed to work wit 2.1.0
# https://gist.github.com/andreigh/f78f631e0039f0af410b269acbb0c8dc
- patches/nvtoolsext.patch # [cuda_compiler_version == "12.0"]
+ - patches/0002-fix-FindCUDA.patch # [build_platform != target_platform and cuda_compiler_version != "None"]
build:
number: {{ build }}
@@ -50,10 +52,13 @@ build:
- python * # [megabuild]
- numpy * # [megabuild]
skip: true # [win]
- skip: true # [cuda_compiler_version != "None" and blas_impl != "mkl"]
+ skip: true # [cuda_compiler_version != "None" and linux64 and blas_impl != "mkl"]
skip: true # [cuda_compiler_version == "10.2"]
skip: true # [cuda_compiler_version == "11.0"]
skip: true # [cuda_compiler_version == "11.1"]
+ # 2024/04 This build seems to fail due to disk space on the CIs
+ # We can potentially re-enable it at a later time
+ skip: true # [cuda_compiler_version == "11.8" and aarch64]
requirements:
# Keep this list synchronized (except for python*, numpy*) in outputs
@@ -165,7 +170,7 @@ outputs:
run_exports:
- {{ pin_subpackage('pytorch', max_pin='x.x') }}
skip: true # [win]
- skip: true # [cuda_compiler_version != "None" and blas_impl != "mkl"]
+ skip: true # [cuda_compiler_version != "None" and linux64 and blas_impl != "mkl"]
skip: true # [cuda_compiler_version == "10.2"]
skip: true # [cuda_compiler_version == "11.0"]
skip: true # [cuda_compiler_version == "11.1"]
@@ -288,19 +293,19 @@ outputs:
- expecttest
- xmlrunner
imports:
- - torch
+ - torch # [not (aarch64 and cuda_compiler_version != "None")]
source_files:
- test
# tools/ is needed to optimise test run
# as of pytorch=2.0.0, there is a bug when trying to run tests without the tools
- tools
commands:
- - OMP_NUM_THREADS=4 python ./test/run_test.py || true # [not win]
+ - OMP_NUM_THREADS=4 python ./test/run_test.py || true # [not win and not (aarch64 and cuda_compiler_version != "None")]
- python ./test/run_test.py # [win]
# Run pip check so as to ensure that all pytorch packages are installed
# https://github.com/conda-forge/pytorch-cpu-feedstock/issues/24
- pip check
- - python -c "import torch; print(torch.__version__)"
+ - python -c "import torch; print(torch.__version__)" # [not (aarch64 and cuda_compiler_version != "None")]
- python -c "import torch; assert torch.backends.mkldnn.m.is_available()" # [x86 and cuda_compiler_version == "None"]
# At conda-forge, we target versions of OSX that are too old for MPS support
# But if users install a newer version of OSX, they will have MPS support
@@ -324,7 +329,9 @@ outputs:
- {{ pin_subpackage("pytorch", exact=True) }}
test:
imports:
- - torch
+ # Throws OSError. See comments in: #224
+ # It may not be resolved until glibc 2.28 images are ready: conda-forge/conda-forge.github.io#1941
+ - torch # [not (aarch64 and cuda_compiler_version != "None")]
about:
home: https://pytorch.org/
diff --git a/recipe/patches/0002-fix-FindCUDA.patch b/recipe/patches/0002-fix-FindCUDA.patch
new file mode 100644
index 00000000..4961f6c0
--- /dev/null
+++ b/recipe/patches/0002-fix-FindCUDA.patch
@@ -0,0 +1,33 @@
+From e5204e94a55d5c190b27480a286b18fb6a92425d Mon Sep 17 00:00:00 2001
+From: Jinzhe Zeng
+Date: Fri, 8 Mar 2024 20:00:16 -0500
+Subject: [PATCH] fix CMake for Cross Compiling
+
+---
+ cmake/Modules_CUDA_fix/upstream/FindCUDA.cmake | 4 ++--
+ cmake/public/cuda.cmake | 5 +++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/Modules_CUDA_fix/upstream/FindCUDA.cmake b/cmake/Modules_CUDA_fix/upstream/FindCUDA.cmake
+index 420ee63cfa..1f009bcc5c 100644
+--- a/cmake/Modules_CUDA_fix/upstream/FindCUDA.cmake
++++ b/cmake/Modules_CUDA_fix/upstream/FindCUDA.cmake
+@@ -721,13 +721,13 @@ if(CMAKE_CROSSCOMPILING)
+ if (ANDROID_ARCH_NAME STREQUAL "arm64")
+ set(CUDA_TOOLKIT_TARGET_NAME "aarch64-linux-androideabi")
+ else()
+- set(CUDA_TOOLKIT_TARGET_NAME "aarch64-linux")
++ set(CUDA_TOOLKIT_TARGET_NAME "sbsa-linux")
+ endif (ANDROID_ARCH_NAME STREQUAL "arm64")
+ endif()
+
+ if (EXISTS "${CUDA_TOOLKIT_ROOT}/targets/${CUDA_TOOLKIT_TARGET_NAME}")
+ set(CUDA_TOOLKIT_TARGET_DIR "${CUDA_TOOLKIT_ROOT}/targets/${CUDA_TOOLKIT_TARGET_NAME}" CACHE PATH "CUDA Toolkit target location.")
+- SET (CUDA_TOOLKIT_ROOT_DIR ${CUDA_TOOLKIT_ROOT})
++ SET (CUDA_TOOLKIT_ROOT_DIR ${CUDA_TOOLKIT_ROOT} CACHE PATH "Toolkit location." FORCE)
+ mark_as_advanced(CUDA_TOOLKIT_TARGET_DIR)
+ endif()
+
+--
+2.43.0
+
|