From 78d1da4868abb0638a3e88e39e25253d5062ffa1 Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Thu, 14 Dec 2023 10:46:27 -0600 Subject: [PATCH 1/2] NEW: Unskip Windows for CUDA 12 --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cef99c6..d0a7d63 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -98,12 +98,11 @@ source: - optional-install.patch build: - number: 1 + number: 2 skip: true # [cuda_compiler_version == "None"] skip: true # [cuda_compiler_version == "10.2"] skip: true # [cuda_compiler_version == "11.0"] skip: true # [cuda_compiler_version == "11.1"] - skip: true # [win and (cuda_compiler_version == "12.0")] run_exports: - {{ pin_subpackage('libmagma', max_pin='x.x.x') }} From d6b672687a2f885074ba0b7ba153750d378c46cb Mon Sep 17 00:00:00 2001 From: Daniel Ching Date: Thu, 14 Dec 2023 10:48:04 -0600 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.28.1, conda-smithy 3.30.1, and conda-forge-pinning 2023.12.14.13.22.08 --- .azure-pipelines/azure-pipelines-win.yml | 4 ++++ ...lercuda-nvcccuda_compiler_version12.0.yaml | 21 +++++++++++++++++++ .scripts/build_steps.sh | 6 +++--- .scripts/run_win_build.bat | 4 ++-- README.md | 7 +++++++ 5 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8bf068f..64422ff 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,6 +8,10 @@ jobs: vmImage: windows-2022 strategy: matrix: + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_64_cuda_compilercuda-nvcccuda_c_h42eb0bda18 win_64_cuda_compilernvcccuda_compiler_version11.2: CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.2 UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml new file mode 100644 index 0000000..db47a5b --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml @@ -0,0 +1,21 @@ +c_compiler: +- vs2019 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- vs2019 +libblas: +- 3.9 *netlib +liblapack: +- 3.9 *netlib +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ab7bc8f..5382195 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -71,7 +71,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 5f648db..7bde26b 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -50,7 +50,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/README.md b/README.md index 642a34b..091c30f 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,13 @@ Current build status variant + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 + + + variant + + win_64_cuda_compilernvcccuda_compiler_version11.2