diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 08a8d927cf..20c19a9358 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -41,8 +41,12 @@ m2w64_cxx_compiler: # [win] m2w64_fortran_compiler: # [win] - m2w64-toolchain # [win] -cuda_compiler: # [linux or win] - - nvcc # [linux or win] +cuda_compiler: + - None + - nvcc # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - nvcc # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - nvcc # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - nvcc # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] cuda_compiler_version: - None - 10.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] @@ -150,11 +154,13 @@ zip_keys: - cxx_compiler_version # [unix] - fortran_compiler_version # [unix] - cudnn # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cuda_compiler # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - cuda_compiler_version # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - cdt_name # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - docker_image # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM", "").startswith("linux-")] - # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - cudnn # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - cuda_compiler # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - cuda_compiler_version # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - python diff --git a/recipe/migrations/cuda92_100_101.yaml b/recipe/migrations/cuda92_100_101.yaml index 8feb9bc403..13f6a075d3 100644 --- a/recipe/migrations/cuda92_100_101.yaml +++ b/recipe/migrations/cuda92_100_101.yaml @@ -26,6 +26,10 @@ fortran_compiler_version: # [linux64] - 7 # [linux64] - 7 # [linux64] +cuda_compiler: # [linux64 or win] + - nvcc # [linux64] + - nvcc # [linux64 or win] + - nvcc # [linux64 or win] cuda_compiler_version: # [linux64 or win] - 9.2 # [linux64] - 10.0 # [linux64 or win] diff --git a/recipe/migrations/cuda_112_ppc64le_aarch64.yaml b/recipe/migrations/cuda_112_ppc64le_aarch64.yaml index 92f5918c41..101256772c 100644 --- a/recipe/migrations/cuda_112_ppc64le_aarch64.yaml +++ b/recipe/migrations/cuda_112_ppc64le_aarch64.yaml @@ -27,6 +27,8 @@ cxx_compiler_version: # [ppc64le or aarch64] fortran_compiler_version: # [ppc64le or aarch64] - 10 # [ppc64le or aarch64] +cuda_compiler: # [ppc64le or aarch64] + - nvcc # [ppc64le or aarch64] cuda_compiler_version: # [ppc64le or aarch64] - 11.2 # [ppc64le or aarch64]