diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b07c74df8..1cdb02bed 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,26 +8,26 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11: + CONFIG: linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12: CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11: + CONFIG: linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12: CONFIG: linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10: - CONFIG: linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10 + linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11: + CONFIG: linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12: CONFIG: linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f57e6cad1..7c2d21106 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,11 +8,11 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compilerNonecuda_compiler_versionNone: - CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone + win_64_cuda_compiler_version11.8: + CONFIG: win_64_cuda_compiler_version11.8 UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.2: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.2 + win_64_cuda_compiler_versionNone: + CONFIG: win_64_cuda_compiler_versionNone UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml similarity index 93% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index a4a8b3fad..633b67991 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -17,15 +17,16 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cuda_compiler_version_min: - '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.8 gflags: - '2.2' glog: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml index 7bd3ebb4e..a86e546c3 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml @@ -20,6 +20,7 @@ cuda_compiler_version: - None cuda_compiler_version_min: - '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml similarity index 93% rename from .ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index e403e93ee..067eed5cc 100644 --- a/.ci_support/linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -9,7 +9,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_arch: - aarch64 cdt_name: @@ -21,15 +21,16 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cuda_compiler_version_min: - '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.8 gflags: - '2.2' glog: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml index 5acca5297..2f064e8ea 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml @@ -24,6 +24,7 @@ cuda_compiler_version: - None cuda_compiler_version_min: - '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml similarity index 93% rename from .ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml rename to .ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml index 3d4b3caa4..58a98c8c0 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '10' +- '11' cdt_name: - cos7 channel_sources: @@ -17,15 +17,16 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cuda_compiler_version_min: - '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.2 +- quay.io/condaforge/linux-anvil-cuda:11.8 gflags: - '2.2' glog: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml index 565626519..ae1ae5453 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12.yaml @@ -20,6 +20,7 @@ cuda_compiler_version: - None cuda_compiler_version_min: - '11.2' +- '11.8' cxx_compiler: - gxx cxx_compiler_version: diff --git a/.ci_support/migrations/aws_crt_cpp0260.yaml b/.ci_support/migrations/aws_crt_cpp0260.yaml deleted file mode 100644 index a986744d6..000000000 --- a/.ci_support/migrations/aws_crt_cpp0260.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for aws_crt_cpp 0.26.0 - kind: version - migration_number: 1 - automerge: true -aws_crt_cpp: -- 0.26.0 -migrator_ts: 1703918042.3772397 diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml b/.ci_support/win_64_cuda_compiler_version11.8.yaml similarity index 97% rename from .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml rename to .ci_support/win_64_cuda_compiler_version11.8.yaml index c39980770..91257d8ba 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.2.yaml +++ b/.ci_support/win_64_cuda_compiler_version11.8.yaml @@ -13,9 +13,10 @@ channel_targets: cuda_compiler: - nvcc cuda_compiler_version: -- '11.2' +- '11.8' cuda_compiler_version_min: - '11.2' +- '11.8' cxx_compiler: - vs2019 gflags: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compiler_versionNone.yaml similarity index 98% rename from .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml rename to .ci_support/win_64_cuda_compiler_versionNone.yaml index 362ca513b..ac4102228 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compiler_versionNone.yaml @@ -16,6 +16,7 @@ cuda_compiler_version: - None cuda_compiler_version_min: - '11.2' +- '11.8' cxx_compiler: - vs2019 gflags: diff --git a/.gitignore b/.gitignore index c00291072..179afe55e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,22 @@ # Everything else is managed by the conda-smithy rerender process. # Please do not modify +# Ignore all files and folders in root * !/conda-forge.yml -!/*/ +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders !/recipe/** !/.ci_support/** +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + *.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index eba1dfdb4..beda247e4 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -57,12 +57,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef014e..00f377a80 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted diff --git a/README.md b/README.md index 8d444a09e..cfd99102d 100644 --- a/README.md +++ b/README.md @@ -139,10 +139,10 @@ Current build status - + @@ -153,10 +153,10 @@ Current build status - + @@ -167,10 +167,10 @@ Current build status - + @@ -195,17 +195,17 @@ Current build status - + - +
VariantStatus
linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 - variant + variant
linux_aarch64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 - variant + variant
linux_ppc64le_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11 - variant + variant
win_64_cuda_compilerNonecuda_compiler_versionNonewin_64_cuda_compiler_version11.8 - variant + variant
win_64_cuda_compilernvcccuda_compiler_version11.2win_64_cuda_compiler_versionNone - variant + variant