diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 2ee0b20..31d0ab2 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,26 +8,17 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12fortran_compiler_version12: - CONFIG: linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12fortran_compiler_version12 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9: - CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10: - CONFIG: linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10 + linux_64_cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10: + CONFIG: linux_64_cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 + linux_64_cuda_compiler_versionNonecxx_compiler_version12fortran_compiler_version12: + CONFIG: linux_64_cuda_compiler_versionNonecxx_compiler_version12fortran_compiler_version12 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d4ee20d..1d62a98 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,12 +11,6 @@ jobs: win_64_cuda_compilerNonecuda_compiler_versionNone: CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.0: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.0 - UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.1: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.1 - UPLOAD_PACKAGES: 'True' win_64_cuda_compilernvcccuda_compiler_version11.2: CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.2 UPLOAD_PACKAGES: 'True' @@ -69,7 +63,10 @@ jobs: if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) - conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10.yaml b/.ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10.yaml similarity index 100% rename from .ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10.yaml rename to .ci_support/linux_64_cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10.yaml diff --git a/.ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12fortran_compiler_version12.yaml b/.ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version12fortran_compiler_version12.yaml similarity index 100% rename from .ci_support/linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12fortran_compiler_version12.yaml rename to .ci_support/linux_64_cuda_compiler_versionNonecxx_compiler_version12fortran_compiler_version12.yaml diff --git a/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9.yaml b/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9.yaml deleted file mode 100644 index f9497b0..0000000 --- a/.ci_support/linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9.yaml +++ /dev/null @@ -1,41 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.0' -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-cuda:11.0 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '9' -icu: -- '72' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -liblapacke: -- 3.9 *netlib -target_platform: -- linux-64 -zip_keys: -- - cxx_compiler_version - - fortran_compiler_version - - cuda_compiler - - cuda_compiler_version - - cdt_name - - docker_image -zlib: -- '1.2' diff --git a/.ci_support/migrations/icu72.yaml b/.ci_support/migrations/icu72.yaml deleted file mode 100644 index 465adac..0000000 --- a/.ci_support/migrations/icu72.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -icu: -- '72' -migrator_ts: 1679327092.7504842 diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.0.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.0.yaml deleted file mode 100644 index e7cabce..0000000 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.0.yaml +++ /dev/null @@ -1,27 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.0' -cxx_compiler: -- vs2019 -icu: -- '72' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -liblapacke: -- 3.9 *netlib -target_platform: -- win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version -zlib: -- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.1.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.1.yaml deleted file mode 100644 index e3d3b91..0000000 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.1.yaml +++ /dev/null @@ -1,27 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.1' -cxx_compiler: -- vs2019 -icu: -- '72' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -liblapacke: -- 3.9 *netlib -target_platform: -- win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version -zlib: -- '1.2' diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index bb00584..3969edf 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -55,11 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -75,6 +70,11 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/README.md b/README.md index b54a754..26ad547 100644 --- a/README.md +++ b/README.md @@ -34,24 +34,17 @@ Current build status - + - + - - - @@ -75,20 +68,6 @@ Current build status variant - - - - - -
VariantStatus
linux_64_cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12fortran_compiler_version12linux_64_cuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10 - variant + variant
linux_64_cuda_compilernvcccuda_compiler_version11.0cxx_compiler_version9fortran_compiler_version9linux_64_cuda_compiler_versionNonecxx_compiler_version12fortran_compiler_version12 - variant - -
linux_64_cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10fortran_compiler_version10 - - variant + variant
win_64_cuda_compilernvcccuda_compiler_version11.0 - - variant - -
win_64_cuda_compilernvcccuda_compiler_version11.1 - - variant - -
win_64_cuda_compilernvcccuda_compiler_version11.2 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 55fb7d7..7893649 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,3 +2,5 @@ c_compiler: # [win] - vs2019 # [win] cxx_compiler: # [win] - vs2019 # [win] +cuda_compiler_version: + - None # [os.environ.get("CF_CUDA_ENABLED", "False") == "False"] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dd82211..9a02ce6 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -46,7 +46,7 @@ source: build: number: 1 # Bug in for cuda 11.1 with c++17 on linux: https://forums.developer.nvidia.com/t/nvc-20-9-fails-to-compile-code-instantiating-any-std-tuple-with-gcc-10-2-on-c-17/160987 - skip: true # [cuda_compiler_version == "10.2" or (linux and cuda_compiler_version == "11.1")] + skip: true # [cuda_compiler_version == "12.0" or cuda_compiler_version == "10.2" or (linux and cuda_compiler_version == "11.1")] requirements: build: