diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b1a63b1..3995516 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -69,6 +69,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 timeoutInMinutes: 360 + variables: {} steps: - script: | @@ -92,6 +93,12 @@ jobs: sudo apt-get autoclean -y >& /dev/null df -h displayName: Manage disk space + - script: | + sudo fallocate -l 10GiB /swapfile || true + sudo chmod 600 /swapfile || true + sudo mkswap /swapfile || true + sudo swapon /swapfile || true + displayName: Create swap file # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml index 5c5e5df..4ece609 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,6 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml index ca5738a..fc473a6 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,6 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml index 0ebbac3..5d56f06 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,6 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml index 9f72b04..bdf6c55 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,6 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml index 461f372..f7b70d0 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,6 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml index ffd7f2a..9b32d2c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,6 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml index 48077e6..f0a4da2 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,6 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml index 2c8a4de..102ce52 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,6 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml index ada8e1d..ae15a4e 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,6 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml index e695f45..77e193c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml @@ -4,6 +4,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -33,6 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml index 18b3333..3112589 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.10.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,6 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml index 7a8f724..2ab9ebb 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.11.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,6 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml index 0fee2a3..3f22c53 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.12.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,6 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml index 255de56..0ccbf85 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,6 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml index d5681a5..49d60a2 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.9.____cpython.yaml @@ -2,6 +2,10 @@ c_compiler: - gcc c_compiler_version: - '11' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -29,6 +33,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version + - c_stdlib_version - cdt_name - cuda_compiler - cuda_compiler_version diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.10.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.10.____cpython.yaml index 0626035..00b9cca 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.10.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.10.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.11.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.11.____cpython.yaml index 883c3c1..2a0cee3 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.11.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.11.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.12.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.12.____cpython.yaml index a0692ab..5576dd2 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.12.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.12.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml index 3f0b71d..8a1dbfe 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.9.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.9.____cpython.yaml index a6bc3e4..d72730d 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.9.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.9.____cpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a4d638b..2f3df6c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -65,7 +65,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-build "${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 a5871f6..7491838 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -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-build.exe "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/conda-forge.yml b/conda-forge.yml index ba0d88b..11e5471 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,8 +1,10 @@ azure: free_disk_space: true + settings_linux: + swapfile_size: 10GiB bot: abi_migration_branches: - - 11.8 + - '11.8' build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 @@ -14,6 +16,8 @@ github: tooling_branch_name: main os_version: linux_64: cos7 + linux_aarch64: cos7 + linux_ppc64le: cos7 provider: linux_aarch64: azure linux_ppc64le: azure diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5fc7d93..464a15a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,10 +10,10 @@ package: source: url: https://github.com/NVIDIA/cuda-python/archive/refs/tags/v{{ version }}.tar.gz - sha256: b943affcd9bc60503ee50949f1c1e1fa4cacbbb399e08311597f936ce28108b8 + sha256: f2bba3e2c7b32e2931cfcb9c85ac7fa2a051152d3b946ff4248cc7a8cb1ea553 build: - number: 1 + number: 2 skip: true # [py<37 or osx or cuda_compiler_version != "11.8"] script: - {{ PYTHON }} -m pip install . --no-deps -vv @@ -27,7 +27,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ compiler('cuda') }} - - sysroot_{{ target_platform }} 2.17 # [linux] + - {{ stdlib('c') }} - cross-python_{{ target_platform }} # [build_platform != target_platform] - python # [build_platform != target_platform] - cython # [build_platform != target_platform]