BUG: Set CUDAToolkit_ROOT to the cross-compile root (#102)

automerged PR by conda-forge/automerge-action
conda-forge · Oct 9, 2023 · c015995 · c015995
2 parents 008491c + 5fcc5b1
commit c015995
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 54 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/linux/activate.sh b/recipe/linux/activate.sh
@@ -54,16 +54,20 @@ fi
 
 if [[ "${CONDA_BUILD_CROSS_COMPILATION:-0}" == "1" ]]; then
     if [[ "${target_platform:-}" == "linux-aarch64" ]]; then
+        TARGET_ROOT=/targets/sbsa-linux
         LIBCUDA_STUB_FILE="${CUDA_HOME}/targets/sbsa-linux/lib/stubs/libcuda.so"
         CUDA_INCLUDE_DIR="${CUDA_HOME}/targets/sbsa-linux/include"
     elif [[ "${target_platform:-}" == "linux-ppc64le" ]]; then
+        TARGET_ROOT=/targets/ppc64le-linux
         LIBCUDA_STUB_FILE="${CUDA_HOME}/targets/ppc64le-linux/lib/stubs/libcuda.so"
         CUDA_INCLUDE_DIR="${CUDA_HOME}/targets/ppc64le-linux/include"
     elif [[ "${target_platform:-}" == "linux-64" ]]; then
+        TARGET_ROOT=/targets/x86_64-linux
         LIBCUDA_STUB_FILE="${CUDA_HOME}/targets/x86_64-linux/lib/stubs/libcuda.so"
         CUDA_INCLUDE_DIR="${CUDA_HOME}/targets/x86_64-linux/include"
     fi
 else
+    TARGET_ROOT=""
     LIBCUDA_STUB_FILE="${CUDA_HOME}/lib64/stubs/libcuda.so"
     CUDA_INCLUDE_DIR="${CUDA_HOME}/include"
 fi
@@ -95,7 +99,7 @@ export CXXFLAGS="${CXXFLAGS} -isystem ${CUDA_INCLUDE_DIR}"
 # CMake looks up components in CUDA_PATH, not CUDA_HOME
 export CUDA_PATH="${CUDA_HOME}"
 # New-style CUDA integrations in CMake
-CMAKE_ARGS="${CMAKE_ARGS:-} -DCUDAToolkit_ROOT=${CUDA_HOME}"
+CMAKE_ARGS="${CMAKE_ARGS:-} -DCUDAToolkit_ROOT=${CUDA_HOME}${TARGET_ROOT}"
 # Old-style CUDA integrations in CMake
 ## See https://github.com/conda-forge/nvcc-feedstock/pull/58#issuecomment-752179349
 CMAKE_ARGS+=" -DCUDA_TOOLKIT_ROOT_DIR=${CUDA_HOME}"

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "nvcc" %}
-{% set number = 22 %}
+{% set number = 23 %}
 
 {% if cuda_compiler_version in (None, "None", True, False) %}
 {% set cuda_major = 0 %}