diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index e0e2fa6..dd86713 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -36,20 +36,44 @@ jobs: CONFIG: linux_64_cdt_namecos7cuda_compiler_version11.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_aarch64_cdt_namecos8cuda_compiler_version11.0: - CONFIG: linux_aarch64_cdt_namecos8cuda_compiler_version11.0 + linux_64_cdt_namecos7cuda_compiler_version11.3: + CONFIG: linux_64_cdt_namecos7cuda_compiler_version11.3 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.3 + linux_64_cdt_namecos7cuda_compiler_version11.4: + CONFIG: linux_64_cdt_namecos7cuda_compiler_version11.4 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.4 + linux_64_cdt_namecos7cuda_compiler_version11.5: + CONFIG: linux_64_cdt_namecos7cuda_compiler_version11.5 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.5 + linux_aarch64_cuda_compiler_version11.0: + CONFIG: linux_aarch64_cuda_compiler_version11.0 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 - linux_aarch64_cdt_namecos8cuda_compiler_version11.1: - CONFIG: linux_aarch64_cdt_namecos8cuda_compiler_version11.1 + linux_aarch64_cuda_compiler_version11.1: + CONFIG: linux_aarch64_cuda_compiler_version11.1 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 - linux_aarch64_cdt_namecos8cuda_compiler_version11.2: - CONFIG: linux_aarch64_cdt_namecos8cuda_compiler_version11.2 + linux_aarch64_cuda_compiler_version11.2: + CONFIG: linux_aarch64_cuda_compiler_version11.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 - linux_ppc64le_cdt_namecos7cuda_compiler_version10.2: - CONFIG: linux_ppc64le_cdt_namecos7cuda_compiler_version10.2 + linux_aarch64_cuda_compiler_version11.3: + CONFIG: linux_aarch64_cuda_compiler_version11.3 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.3 + linux_aarch64_cuda_compiler_version11.4: + CONFIG: linux_aarch64_cuda_compiler_version11.4 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.4 + linux_aarch64_cuda_compiler_version11.5: + CONFIG: linux_aarch64_cuda_compiler_version11.5 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64-cuda:11.5 + linux_ppc64le_cuda_compiler_version10.2: + CONFIG: linux_ppc64le_cuda_compiler_version10.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:10.2 timeoutInMinutes: 360 @@ -72,6 +96,11 @@ jobs: export CI=azure export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi .scripts/run_docker_build.sh displayName: Run docker build env: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 84f0e66..9f7eabb 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 strategy: matrix: win_64_cuda_compiler_version10.0: @@ -26,6 +26,15 @@ jobs: win_64_cuda_compiler_version11.2: CONFIG: win_64_cuda_compiler_version11.2 UPLOAD_PACKAGES: 'True' + win_64_cuda_compiler_version11.3: + CONFIG: win_64_cuda_compiler_version11.3 + UPLOAD_PACKAGES: 'True' + win_64_cuda_compiler_version11.4: + CONFIG: win_64_cuda_compiler_version11.4 + UPLOAD_PACKAGES: 'True' + win_64_cuda_compiler_version11.5: + CONFIG: win_64_cuda_compiler_version11.5 + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -67,7 +76,7 @@ jobs: - task: CondaEnvironment@1 inputs: - packageSpecs: 'python=3.6 conda-build conda "conda-forge-ci-setup=3" pip' # Optional + packageSpecs: 'python=3.9 conda-build conda "conda-forge-ci-setup=3" pip boa' # Optional installOptions: "-c conda-forge" updateConda: true displayName: Install conda-build and activate environment @@ -101,7 +110,7 @@ jobs: - script: | call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 @@ -122,4 +131,4 @@ jobs: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file diff --git a/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.0.yaml b/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.0.yaml index 2e65fa9..efe9999 100644 --- a/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.0.yaml +++ b/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.0.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.1.yaml b/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.1.yaml index c3fffc2..e3938ee 100644 --- a/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.1.yaml +++ b/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.1.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.2.yaml b/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.2.yaml index c08f9f4..26ba761 100644 --- a/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.2.yaml +++ b/.ci_support/linux_64_cdt_namecos6cuda_compiler_version10.2.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cdt_namecos6cuda_compiler_version9.2.yaml b/.ci_support/linux_64_cdt_namecos6cuda_compiler_version9.2.yaml index b094700..8d1f183 100644 --- a/.ci_support/linux_64_cdt_namecos6cuda_compiler_version9.2.yaml +++ b/.ci_support/linux_64_cdt_namecos6cuda_compiler_version9.2.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.0.yaml b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.0.yaml index 5a695e1..7c010b9 100644 --- a/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.0.yaml +++ b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.0.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.1.yaml b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.1.yaml index d70d8f0..00c1d3b 100644 --- a/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.1.yaml +++ b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.1.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.2.yaml b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.2.yaml index ad86c27..f8b950f 100644 --- a/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.2.yaml +++ b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.2.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.3.yaml b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.3.yaml new file mode 100644 index 0000000..8af35df --- /dev/null +++ b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.3.yaml @@ -0,0 +1,28 @@ +c_compiler: +- gcc +c_compiler_version: +- '7' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.3' +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.3 +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cuda_compiler_version + - cdt_name + - docker_image diff --git a/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.4.yaml b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.4.yaml new file mode 100644 index 0000000..6dd50db --- /dev/null +++ b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.4.yaml @@ -0,0 +1,28 @@ +c_compiler: +- gcc +c_compiler_version: +- '7' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.4' +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.4 +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cuda_compiler_version + - cdt_name + - docker_image diff --git a/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.5.yaml b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.5.yaml new file mode 100644 index 0000000..33a1480 --- /dev/null +++ b/.ci_support/linux_64_cdt_namecos7cuda_compiler_version11.5.yaml @@ -0,0 +1,28 @@ +c_compiler: +- gcc +c_compiler_version: +- '7' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.5' +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- quay.io/condaforge/linux-anvil-cuda:11.5 +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cuda_compiler_version + - cdt_name + - docker_image diff --git a/.ci_support/linux_aarch64_cdt_namecos8cuda_compiler_version11.0.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.0.yaml similarity index 98% rename from .ci_support/linux_aarch64_cdt_namecos8cuda_compiler_version11.0.yaml rename to .ci_support/linux_aarch64_cuda_compiler_version11.0.yaml index 5a2a14e..b2db1a2 100644 --- a/.ci_support/linux_aarch64_cdt_namecos8cuda_compiler_version11.0.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.0.yaml @@ -7,7 +7,7 @@ c_compiler_version: cdt_arch: - aarch64 cdt_name: -- cos8 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_aarch64_cdt_namecos8cuda_compiler_version11.1.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.1.yaml similarity index 98% rename from .ci_support/linux_aarch64_cdt_namecos8cuda_compiler_version11.1.yaml rename to .ci_support/linux_aarch64_cuda_compiler_version11.1.yaml index d3e5fa2..5053b71 100644 --- a/.ci_support/linux_aarch64_cdt_namecos8cuda_compiler_version11.1.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.1.yaml @@ -7,7 +7,7 @@ c_compiler_version: cdt_arch: - aarch64 cdt_name: -- cos8 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_aarch64_cdt_namecos8cuda_compiler_version11.2.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml similarity index 98% rename from .ci_support/linux_aarch64_cdt_namecos8cuda_compiler_version11.2.yaml rename to .ci_support/linux_aarch64_cuda_compiler_version11.2.yaml index 0a5ab08..a8ac68e 100644 --- a/.ci_support/linux_aarch64_cdt_namecos8cuda_compiler_version11.2.yaml +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.2.yaml @@ -7,7 +7,7 @@ c_compiler_version: cdt_arch: - aarch64 cdt_name: -- cos8 +- cos7 channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.3.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.3.yaml new file mode 100644 index 0000000..5062d7b --- /dev/null +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.3.yaml @@ -0,0 +1,32 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '8' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.3' +cxx_compiler: +- gxx +cxx_compiler_version: +- '8' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64-cuda:11.3 +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cuda_compiler_version + - cdt_name + - docker_image diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.4.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.4.yaml new file mode 100644 index 0000000..31461f7 --- /dev/null +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.4.yaml @@ -0,0 +1,32 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '8' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.4' +cxx_compiler: +- gxx +cxx_compiler_version: +- '8' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64-cuda:11.4 +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cuda_compiler_version + - cdt_name + - docker_image diff --git a/.ci_support/linux_aarch64_cuda_compiler_version11.5.yaml b/.ci_support/linux_aarch64_cuda_compiler_version11.5.yaml new file mode 100644 index 0000000..5115b57 --- /dev/null +++ b/.ci_support/linux_aarch64_cuda_compiler_version11.5.yaml @@ -0,0 +1,32 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +c_compiler: +- gcc +c_compiler_version: +- '8' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.5' +cxx_compiler: +- gxx +cxx_compiler_version: +- '8' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64-cuda:11.5 +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cuda_compiler_version + - cdt_name + - docker_image diff --git a/.ci_support/linux_ppc64le_cdt_namecos7cuda_compiler_version10.2.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version10.2.yaml similarity index 94% rename from .ci_support/linux_ppc64le_cdt_namecos7cuda_compiler_version10.2.yaml rename to .ci_support/linux_ppc64le_cuda_compiler_version10.2.yaml index be6ef2f..5e9ead0 100644 --- a/.ci_support/linux_ppc64le_cdt_namecos7cuda_compiler_version10.2.yaml +++ b/.ci_support/linux_ppc64le_cuda_compiler_version10.2.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/win_64_cuda_compiler_version10.0.yaml b/.ci_support/win_64_cuda_compiler_version10.0.yaml index 906e362..d47d3f5 100644 --- a/.ci_support/win_64_cuda_compiler_version10.0.yaml +++ b/.ci_support/win_64_cuda_compiler_version10.0.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/win_64_cuda_compiler_version10.1.yaml b/.ci_support/win_64_cuda_compiler_version10.1.yaml index ebb56e5..594f3ce 100644 --- a/.ci_support/win_64_cuda_compiler_version10.1.yaml +++ b/.ci_support/win_64_cuda_compiler_version10.1.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/win_64_cuda_compiler_version10.2.yaml b/.ci_support/win_64_cuda_compiler_version10.2.yaml index 2a27b0b..27ea11d 100644 --- a/.ci_support/win_64_cuda_compiler_version10.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version10.2.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/win_64_cuda_compiler_version11.0.yaml b/.ci_support/win_64_cuda_compiler_version11.0.yaml index 6e72c56..80c88e9 100644 --- a/.ci_support/win_64_cuda_compiler_version11.0.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.0.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/win_64_cuda_compiler_version11.1.yaml b/.ci_support/win_64_cuda_compiler_version11.1.yaml index 5259dd5..a240557 100644 --- a/.ci_support/win_64_cuda_compiler_version11.1.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.1.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/win_64_cuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compiler_version11.2.yaml index 1f53b40..b036fed 100644 --- a/.ci_support/win_64_cuda_compiler_version11.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.2.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/win_64_cuda_compiler_version11.3.yaml b/.ci_support/win_64_cuda_compiler_version11.3.yaml new file mode 100644 index 0000000..a05ab78 --- /dev/null +++ b/.ci_support/win_64_cuda_compiler_version11.3.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.3' +cxx_compiler: +- vs2017 +target_platform: +- win-64 diff --git a/.ci_support/win_64_cuda_compiler_version11.4.yaml b/.ci_support/win_64_cuda_compiler_version11.4.yaml new file mode 100644 index 0000000..5fbc2ff --- /dev/null +++ b/.ci_support/win_64_cuda_compiler_version11.4.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.4' +cxx_compiler: +- vs2017 +target_platform: +- win-64 diff --git a/.ci_support/win_64_cuda_compiler_version11.5.yaml b/.ci_support/win_64_cuda_compiler_version11.5.yaml new file mode 100644 index 0000000..1313916 --- /dev/null +++ b/.ci_support/win_64_cuda_compiler_version11.5.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.5' +cxx_compiler: +- vs2017 +target_platform: +- win-64 diff --git a/.gitattributes b/.gitattributes index 9060b27..ce52713 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,6 +18,7 @@ bld.bat text eol=crlf .gitignore linguist-generated=true .travis.yml linguist-generated=true .scripts/* linguist-generated=true +.woodpecker.yml linguist-generated=true LICENSE.txt linguist-generated=true README.md linguist-generated=true azure-pipelines.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 71a0686..ff01283 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -5,6 +5,8 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +# -*- mode: jinja-shell -*- + set -xeuo pipefail export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh @@ -25,9 +27,10 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC -BUILD_CMD=build -conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge + +mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -38,6 +41,7 @@ source run_conda_forge_build_setup make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + ( endgroup "Configuring conda" ) 2> /dev/null if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then @@ -51,7 +55,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda $BUILD_CMD "${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" ( startgroup "Validating outputs" ) 2> /dev/null @@ -62,7 +66,7 @@ else ( startgroup "Uploading packages" ) 2> /dev/null - if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 244ccd1..0c6515f 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -75,12 +75,15 @@ fi ( startgroup "Start Docker" ) 2> /dev/null export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +export IS_PR_BUILD="${IS_PR_BUILD:-False}" +docker pull "${DOCKER_IMAGE}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e IS_PR_BUILD \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ @@ -91,9 +94,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ - $DOCKER_IMAGE \ + "${DOCKER_IMAGE}" \ bash \ - /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" # verify that the end of the script was reached test -f "$DONE_CANARY" diff --git a/README.md b/README.md index a032824..875041c 100644 --- a/README.md +++ b/README.md @@ -76,31 +76,73 @@ Current build status - linux_aarch64_cdt_namecos8cuda_compiler_version11.0 + linux_64_cdt_namecos7cuda_compiler_version11.3 - variant + variant - linux_aarch64_cdt_namecos8cuda_compiler_version11.1 + linux_64_cdt_namecos7cuda_compiler_version11.4 - variant + variant - linux_aarch64_cdt_namecos8cuda_compiler_version11.2 + linux_64_cdt_namecos7cuda_compiler_version11.5 - variant + variant - linux_ppc64le_cdt_namecos7cuda_compiler_version10.2 + linux_aarch64_cuda_compiler_version11.0 - variant + variant + + + + linux_aarch64_cuda_compiler_version11.1 + + + variant + + + + linux_aarch64_cuda_compiler_version11.2 + + + variant + + + + linux_aarch64_cuda_compiler_version11.3 + + + variant + + + + linux_aarch64_cuda_compiler_version11.4 + + + variant + + + + linux_aarch64_cuda_compiler_version11.5 + + + variant + + + + linux_ppc64le_cuda_compiler_version10.2 + + + variant @@ -145,6 +187,27 @@ Current build status variant + + win_64_cuda_compiler_version11.3 + + + variant + + + + win_64_cuda_compiler_version11.4 + + + variant + + + + win_64_cuda_compiler_version11.5 + + + variant + + @@ -186,7 +249,8 @@ conda search nvcc_linux-64 --channel conda-forge About conda-forge ================= -[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) +[![Powered by +NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](https://numfocus.org) conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the diff --git a/build-locally.py b/build-locally.py index 00eeb34..8b74348 100755 --- a/build-locally.py +++ b/build-locally.py @@ -13,6 +13,7 @@ def setup_environment(ns): os.environ["CONFIG"] = ns.config os.environ["UPLOAD_PACKAGES"] = "False" + os.environ["IS_PR_BUILD"] = "True" if ns.debug: os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" if ns.output_id: @@ -21,6 +22,10 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) + if "OSX_SDK_DIR" not in os.environ: + os.environ["OSX_SDK_DIR"] = os.path.join( + os.path.dirname(__file__), "SDKs" + ) def run_docker_build(ns): diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index a7c7245..2ccedfa 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -30,6 +30,9 @@ cuda_compiler_version: - 11.0 # [linux64 or win or (linux and ppc64le) or (linux and aarch64)] - 11.1 # [linux64 or win or (linux and ppc64le) or (linux and aarch64)] - 11.2 # [linux64 or win or (linux and ppc64le) or (linux and aarch64)] + - 11.3 # [linux64 or win or (linux and ppc64le) or (linux and aarch64)] + - 11.4 # [linux64 or win or (linux and ppc64le) or (linux and aarch64)] + - 11.5 # [linux64 or win or (linux and ppc64le) or (linux and aarch64)] c_compiler_version: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux")] - 7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"] @@ -56,15 +59,24 @@ docker_image: # [os.environ.get("BUILD_PLATFOR - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.3 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.4 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] + - quay.io/condaforge/linux-anvil-cuda:11.5 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"] - quay.io/condaforge/linux-anvil-ppc64le-cuda:10.2 # [linux and ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.0 # [linux and ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.1 # [linux and ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2 # [linux and ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.3 # [linux and ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.4 # [linux and ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] + - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.5 # [linux and ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"] - quay.io/condaforge/linux-anvil-aarch64-cuda:11.0 # [linux and aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - quay.io/condaforge/linux-anvil-aarch64-cuda:11.1 # [linux and aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 # [linux and aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.3 # [linux and aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.4 # [linux and aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] + - quay.io/condaforge/linux-anvil-aarch64-cuda:11.5 # [linux and aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"] cudnn: # start for cuda_compiler_version == None @@ -78,15 +90,24 @@ cudnn: - 8 # [linux64 or win] # CUDA 11.0 - 8 # [linux64 or win] # CUDA 11.1 - 8 # [linux64 or win] # CUDA 11.2 + - 8 # [linux64 or win] # CUDA 11.3 + - 8 # [linux64 or win] # CUDA 11.4 + - 8 # [linux64 or win] # CUDA 11.5 - undefined # [linux and ppc64le] # CUDA 10.2 - undefined # [linux and ppc64le] # CUDA 11.0 - undefined # [linux and ppc64le] # CUDA 11.1 - undefined # [linux and ppc64le] # CUDA 11.2 + - undefined # [linux and ppc64le] # CUDA 11.3 + - undefined # [linux and ppc64le] # CUDA 11.4 + - undefined # [linux and ppc64le] # CUDA 11.5 - undefined # [linux and aarch64] # CUDA 11.0 - undefined # [linux and aarch64] # CUDA 11.1 - undefined # [linux and aarch64] # CUDA 11.2 + - undefined # [linux and aarch64] # CUDA 11.3 + - undefined # [linux and aarch64] # CUDA 11.4 + - undefined # [linux and aarch64] # CUDA 11.5 cdt_name: # [linux] # start cuda_compiler_version == None @@ -103,12 +124,21 @@ cdt_name: # [linux] - cos7 # [linux64] # CUDA 11.0 - cos7 # [linux64] # CUDA 11.1 - cos7 # [linux64] # CUDA 11.2 + - cos7 # [linux64] # CUDA 11.3 + - cos7 # [linux64] # CUDA 11.4 + - cos7 # [linux64] # CUDA 11.5 - cos7 # [linux and ppc64le] # CUDA 10.2 - - cos8 # [linux and ppc64le] # CUDA 11.0 - - cos8 # [linux and ppc64le] # CUDA 11.1 - - cos8 # [linux and ppc64le] # CUDA 11.2 - - - cos8 # [linux and aarch64] # CUDA 11.0 - - cos8 # [linux and aarch64] # CUDA 11.1 - - cos8 # [linux and aarch64] # CUDA 11.2 + - cos7 # [linux and ppc64le] # CUDA 11.0 + - cos7 # [linux and ppc64le] # CUDA 11.1 + - cos7 # [linux and ppc64le] # CUDA 11.2 + - cos7 # [linux and ppc64le] # CUDA 11.3 + - cos7 # [linux and ppc64le] # CUDA 11.4 + - cos7 # [linux and ppc64le] # CUDA 11.5 + + - cos7 # [linux and aarch64] # CUDA 11.0 + - cos7 # [linux and aarch64] # CUDA 11.1 + - cos7 # [linux and aarch64] # CUDA 11.2 + - cos7 # [linux and aarch64] # CUDA 11.3 + - cos7 # [linux and aarch64] # CUDA 11.4 + - cos7 # [linux and aarch64] # CUDA 11.5 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1775c1f..d598192 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,13 +1,13 @@ {% set name = "nvcc" %} -{% set number = 15 %} +{% set number = 16 %} {% if cuda_compiler_version in (None, "None", True, False) %} {% set cuda_major = 0 %} {% set cuda_minor = 0 %} {% set cuda_major_minor = (0, 0) %} {% else %} -{% set cuda_major = environ.get("cuda_compiler_version", "11.2").split(".")[0]|int %} -{% set cuda_minor = environ.get("cuda_compiler_version", "11.2").split(".")[1]|int %} +{% set cuda_major = environ.get("cuda_compiler_version", "11.5").split(".")[0]|int %} +{% set cuda_minor = environ.get("cuda_compiler_version", "11.5").split(".")[1]|int %} {% set cuda_major_minor = (cuda_major, cuda_minor) %} {% endif %}