diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 088615f8d..fc2fea658 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,84 +8,84 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.7.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.7.____cpython + linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.10.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.8.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.8.____cpython + linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.7.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.9.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.9.____cpython + linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.8.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython + linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.9.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.1 - linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.7.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.7.____cpython + linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.8.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.8.____cpython + linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.7.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.9.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.9.____cpython + linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython + linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.7.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.7.____cpython + linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.10.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.8.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.8.____cpython + linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.7.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.9.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.9.____cpython + linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.8.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.21python3.10.____cpython: - CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.21python3.10.____cpython + linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.9.____cpython: + CONFIG: linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.7.____cpython: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.7.____cpython + linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.10.____cpython: + CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.8.____cpython: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.8.____cpython + linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython: + CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython + linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython: + CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython: - CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython + linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython: + CONFIG: linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-cuda:10.2 - linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.7.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.7.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.10.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.8.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.8.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 - linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython: - CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython + linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython: + CONFIG: linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.0 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d41ba12d5..239a0b987 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,26 +8,26 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.19python3.7.____cpython: - CONFIG: osx_64_numpy1.19python3.7.____cpython + osx_64_python3.10.____cpython: + CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.19python3.8.____cpython: - CONFIG: osx_64_numpy1.19python3.8.____cpython + osx_64_python3.7.____cpython: + CONFIG: osx_64_python3.7.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.19python3.9.____cpython: - CONFIG: osx_64_numpy1.19python3.9.____cpython + osx_64_python3.8.____cpython: + CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_python3.9.____cpython: + CONFIG: osx_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.19python3.8.____cpython: - CONFIG: osx_arm64_numpy1.19python3.8.____cpython + osx_arm64_python3.10.____cpython: + CONFIG: osx_arm64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.19python3.9.____cpython: - CONFIG: osx_arm64_numpy1.19python3.9.____cpython + osx_arm64_python3.8.____cpython: + CONFIG: osx_arm64_python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.21python3.10.____cpython: - CONFIG: osx_arm64_numpy1.21python3.10.____cpython + osx_arm64_python3.9.____cpython: + CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.10.____cpython.yaml index cc07a2577..a35491959 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.10.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.21' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.7.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.7.____cpython.yaml index c21f49b8a..3c4cac6f9 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.7.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.8.____cpython.yaml index dfb625ce0..68ec99794 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.8.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.9.____cpython.yaml index 568abb14e..385588668 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.9.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython.yaml index ca701428a..484de4111 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.21' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.7.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.7.____cpython.yaml index d7761bf77..9db5da5b0 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.7.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython.yaml index d3e4f7274..422e5c998 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython.yaml index 58ae58e9e..cd82a7eb9 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.10.____cpython.yaml index 938dd13c1..6847a2aec 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.10.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.21' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.7.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.7.____cpython.yaml index f52300126..b8770f157 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.7.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.8.____cpython.yaml index da0d42c2e..335205402 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.8.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.9.____cpython.yaml index d1a2598c2..3986c830d 100644 --- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.9.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.10.____cpython.yaml index 2b7265036..569d6fb2f 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.10.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.21' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython.yaml index fc1d2c40f..eba3c6d1f 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython.yaml index 46ba3cf44..193ab4e3c 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython.yaml index f72fa8611..4e065541b 100644 --- a/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.10.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.10.____cpython.yaml index 8ee6134f3..48414d2f7 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.10.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.21' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.7.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.7.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython.yaml index c21cfb4fe..271fa31e2 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.7.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython.yaml index cef103bd8..3744cefe1 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython.yaml index 55ca04e7f..88b9df597 100644 --- a/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython.yaml @@ -36,8 +36,6 @@ libprotobuf: - '3.19' nccl: - '2' -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -72,7 +70,6 @@ zip_keys: - cdt_name - docker_image - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/migrations/libprotobuf319.yaml b/.ci_support/migrations/libprotobuf319.yaml deleted file mode 100644 index bafbe1ff9..000000000 --- a/.ci_support/migrations/libprotobuf319.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libprotobuf: -- '3.19' -migrator_ts: 1634806373.384677 diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml similarity index 96% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_python3.10.____cpython.yaml index 676c68252..e7532c367 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -32,8 +32,6 @@ libprotobuf: - '3.19' macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.21' openssl: - 1.1.1 pin_run_as_build: @@ -64,7 +62,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/osx_64_numpy1.19python3.7.____cpython.yaml b/.ci_support/osx_64_python3.7.____cpython.yaml similarity index 96% rename from .ci_support/osx_64_numpy1.19python3.7.____cpython.yaml rename to .ci_support/osx_64_python3.7.____cpython.yaml index eeb812b6e..c0d229ca8 100644 --- a/.ci_support/osx_64_numpy1.19python3.7.____cpython.yaml +++ b/.ci_support/osx_64_python3.7.____cpython.yaml @@ -32,8 +32,6 @@ libprotobuf: - '3.19' macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -64,7 +62,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/osx_64_numpy1.19python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml similarity index 96% rename from .ci_support/osx_64_numpy1.19python3.8.____cpython.yaml rename to .ci_support/osx_64_python3.8.____cpython.yaml index 9f455cc2e..474e6a9ec 100644 --- a/.ci_support/osx_64_numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -32,8 +32,6 @@ libprotobuf: - '3.19' macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -64,7 +62,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml similarity index 96% rename from .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/osx_64_python3.9.____cpython.yaml index 8aa0bee7a..99af3e48b 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -32,8 +32,6 @@ libprotobuf: - '3.19' macos_machine: - x86_64-apple-darwin13.4.0 -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -64,7 +62,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml similarity index 96% rename from .ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_arm64_python3.10.____cpython.yaml index efa0fe876..5a6fda96e 100644 --- a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -30,8 +30,6 @@ libprotobuf: - '3.19' macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '1.21' openssl: - 1.1.1 pin_run_as_build: @@ -62,7 +60,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml similarity index 96% rename from .ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml rename to .ci_support/osx_arm64_python3.8.____cpython.yaml index fe7f37363..5890353c5 100644 --- a/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -30,8 +30,6 @@ libprotobuf: - '3.19' macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -62,7 +60,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1.2' diff --git a/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml similarity index 96% rename from .ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/osx_arm64_python3.9.____cpython.yaml index ebe837940..945b233a4 100644 --- a/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -30,8 +30,6 @@ libprotobuf: - '3.19' macos_machine: - arm64-apple-darwin20.0.0 -numpy: -- '1.19' openssl: - 1.1.1 pin_run_as_build: @@ -62,7 +60,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - - python - - numpy - python_impl zlib: - '1.2' diff --git a/README.md b/README.md index 51ac032a2..c8d3f87e4 100644 --- a/README.md +++ b/README.md @@ -37,192 +37,192 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/conda-forge.yml b/conda-forge.yml index 2e0a2ded8..403a193fb 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -3,6 +3,10 @@ build_platform: conda_forge_output_validation: true provider: win: azure +remote_ci_setup: + - conda-forge-ci-setup=3 + - conda-forge/label/lief_dev::py-lief + - conda-forge/label/lief_dev::liblief github: branch_name: main tooling_branch_name: main diff --git a/recipe/build.sh b/recipe/build.sh index a73337182..7d44d2574 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -63,7 +63,8 @@ export BAZEL_MKL_OPT="" mkdir -p ./bazel_output_base export BAZEL_OPTS="" -export CC_OPT_FLAGS="${CFLAGS}" +# Set this to something as otherwise, it would include CFLAGS which itself contains a host path and this then breaks bazel's include path validation. +export CC_OPT_FLAGS="-O2" # Quick debug: # cp -r ${RECIPE_DIR}/build.sh . && bazel clean && bash -x build.sh --logging=6 | tee log.txt @@ -91,13 +92,14 @@ BUILD_OPTS=" --define=PREFIX=${PREFIX} --define=PROTOBUF_INCLUDE_PATH=${PREFIX}/include --config=noaws - --cpu=${TARGET_CPU}" + --cpu=${TARGET_CPU} + --local_cpu_resources=${CPU_COUNT}" if [[ "${target_platform}" == "osx-arm64" ]]; then BUILD_OPTS="${BUILD_OPTS} --config=macos_arm64" fi -export TF_ENABLE_XLA=0 -export BUILD_TARGET="//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow //tensorflow:libtensorflow_cc.so" +export TF_ENABLE_XLA=1 +export BUILD_TARGET="//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow //tensorflow:libtensorflow_cc${SHLIB_EXT}" # Python settings export PYTHON_BIN_PATH=${PYTHON} @@ -161,27 +163,30 @@ bazel ${BAZEL_OPTS} build ${BUILD_OPTS} ${BUILD_TARGET} mkdir -p $SRC_DIR/tensorflow_pkg bash -x bazel-bin/tensorflow/tools/pip_package/build_pip_package $SRC_DIR/tensorflow_pkg -if [[ "${target_platform}" == linux-* ]]; then - cp $SRC_DIR/bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz $SRC_DIR - mkdir -p $SRC_DIR/libtensorflow_cc_output/lib +# Build libtensorflow(_cc) +cp $SRC_DIR/bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz $SRC_DIR +mkdir -p $SRC_DIR/libtensorflow_cc_output/lib +if [[ "${target_platform}" == osx-* ]]; then + cp -RP bazel-bin/tensorflow/libtensorflow_cc.* $SRC_DIR/libtensorflow_cc_output/lib/ + cp -RP bazel-bin/tensorflow/libtensorflow_framework.* $SRC_DIR/libtensorflow_cc_output/lib/ +else cp -d bazel-bin/tensorflow/libtensorflow_cc.so* $SRC_DIR/libtensorflow_cc_output/lib/ cp -d bazel-bin/tensorflow/libtensorflow_framework.so* $SRC_DIR/libtensorflow_cc_output/lib/ cp -d $SRC_DIR/libtensorflow_cc_output/lib/libtensorflow_framework.so.2 $SRC_DIR/libtensorflow_cc_output/lib/libtensorflow_framework.so - # Make writable so patchelf can do its magic - chmod u+w $SRC_DIR/libtensorflow_cc_output/lib/libtensorflow* - - mkdir -p $SRC_DIR/libtensorflow_cc_output/include/tensorflow - rsync -avzh --exclude '_virtual_includes/' --exclude 'pip_package/' --exclude 'lib_package/' --include '*/' --include '*.h' --include '*.inc' --exclude '*' bazel-bin/ $SRC_DIR/libtensorflow_cc_output/include - rsync -avzh --include '*/' --include '*.h' --include '*.inc' --exclude '*' tensorflow/cc $SRC_DIR/libtensorflow_cc_output/include/tensorflow/ - rsync -avzh --include '*/' --include '*.h' --include '*.inc' --exclude '*' tensorflow/core $SRC_DIR/libtensorflow_cc_output/include/tensorflow/ - rsync -avzh --include '*/' --include '*' --exclude '*.cc' third_party/ $SRC_DIR/libtensorflow_cc_output/include/third_party/ - rsync -avzh --include '*/' --include '*' --exclude '*.txt' bazel-work/external/eigen_archive/Eigen/ $SRC_DIR/libtensorflow_cc_output/include/Eigen/ - rsync -avzh --include '*/' --include '*' --exclude '*.txt' bazel-work/external/eigen_archive/unsupported/ $SRC_DIR/libtensorflow_cc_output/include/unsupported/ - pushd $SRC_DIR/libtensorflow_cc_output - tar cf ../libtensorflow_cc_output.tar . - popd - chmod -R u+rw $SRC_DIR/libtensorflow_cc_output - rm -r $SRC_DIR/libtensorflow_cc_output fi +# Make writable so patchelf can do its magic +chmod u+w $SRC_DIR/libtensorflow_cc_output/lib/libtensorflow* + +mkdir -p $SRC_DIR/libtensorflow_cc_output/include/tensorflow +rsync -r --chmod=D777,F666 --exclude '_solib*' --exclude '_virtual_includes/' --exclude 'pip_package/' --exclude 'lib_package/' --include '*/' --include '*.h' --include '*.inc' --exclude '*' bazel-bin/ $SRC_DIR/libtensorflow_cc_output/include +rsync -r --chmod=D777,F666 --include '*/' --include '*.h' --include '*.inc' --exclude '*' tensorflow/cc $SRC_DIR/libtensorflow_cc_output/include/tensorflow/ +rsync -r --chmod=D777,F666 --include '*/' --include '*.h' --include '*.inc' --exclude '*' tensorflow/core $SRC_DIR/libtensorflow_cc_output/include/tensorflow/ +rsync -r --chmod=D777,F666 --include '*/' --include '*' --exclude '*.cc' third_party/ $SRC_DIR/libtensorflow_cc_output/include/third_party/ +rsync -r --chmod=D777,F666 --include '*/' --include '*' --exclude '*.txt' bazel-work/external/eigen_archive/Eigen/ $SRC_DIR/libtensorflow_cc_output/include/Eigen/ +rsync -r --chmod=D777,F666 --include '*/' --include '*' --exclude '*.txt' bazel-work/external/eigen_archive/unsupported/ $SRC_DIR/libtensorflow_cc_output/include/unsupported/ +pushd $SRC_DIR/libtensorflow_cc_output + tar cf ../libtensorflow_cc_output.tar . +popd +rm -r $SRC_DIR/libtensorflow_cc_output bazel clean diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index d6f370e3b..ca61216d9 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -3,3 +3,21 @@ # available on 10.13 MACOSX_SDK_VERSION: # [osx and x86_64] - "10.13" # [osx and x86_64] +# c_compiler_version: # [linux] +# - 9 # [linux] +# - 7 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] +# - 9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] +# - 9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] +# - 9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] +# cxx_compiler_version: # [linux] +# - 9 # [linux] +# - 7 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] +# - 9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] +# - 9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] +# - 9 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux64] +# cuda_compiler_version: +# - None +# - 10.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] +# - 11.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] +# - 11.1 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] +# - 11.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] diff --git a/recipe/custom_toolchain/cc_wrapper.sh.template b/recipe/custom_toolchain/cc_wrapper.sh.template index 5fc363449..947c1aa69 100644 --- a/recipe/custom_toolchain/cc_wrapper.sh.template +++ b/recipe/custom_toolchain/cc_wrapper.sh.template @@ -28,6 +28,8 @@ set -eu INSTALL_NAME_TOOL="${INSTALL_NAME_TOOL}" +export MACOSX_SDK_VERSION="${MACOSX_SDK_VERSION}" +export MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" LIBS= LIB_DIRS= diff --git a/recipe/gen-bazel-toolchain.sh b/recipe/gen-bazel-toolchain.sh index 63e3098e3..95915c15d 100755 --- a/recipe/gen-bazel-toolchain.sh +++ b/recipe/gen-bazel-toolchain.sh @@ -3,6 +3,12 @@ set -euxo pipefail function apply_cc_template() { + # Strip trailing/duplicate whitespace + CFLAGS=$(echo $CFLAGS | xargs echo -n) + CPPFLAGS=$(echo $CPPFLAGS | xargs echo -n) + CXXFLAGS=$(echo $CXXFLAGS | xargs echo -n) + LDFLAGS=$(echo $LDFLAGS | xargs echo -n) + sed -ie "s:TARGET_CPU:${TARGET_CPU}:" $1 sed -ie "s:TARGET_LIBC:${TARGET_LIBC}:" $1 sed -ie "s:TARGET_SYSTEM:${TARGET_SYSTEM}:" $1 @@ -15,6 +21,7 @@ function apply_cc_template() { sed -ie "s:\${CUDA_HOME}:${CUDA_HOME:-}:" $1 sed -ie "s:\${PREFIX}:${PREFIX}:" $1 sed -ie "s:\${BUILD_PREFIX}:${BUILD_PREFIX}:" $1 + sed -ie "s:\${HOST_PREFIX}:${HOST_PREFIX}:" $1 sed -ie "s:\${LD}:${LD}:" $1 sed -ie "s:\${CFLAGS}:${CFLAGS}:" $1 sed -ie "s:\${CPPFLAGS}:${CPPFLAGS}:" $1 @@ -38,14 +45,19 @@ pushd custom_toolchain -e "s:\${target_platform}:${target_platform}:" \ -e "s:\${INSTALL_NAME_TOOL}:${INSTALL_NAME_TOOL}:" \ -e "s:\${CONDA_BUILD_SYSROOT}:${CONDA_BUILD_SYSROOT}:" \ + -e "s:\${MACOSX_SDK_VERSION}:${MACOSX_SDK_VERSION}:" \ + -e "s:\${MACOSX_DEPLOYMENT_TARGET}:${MACOSX_DEPLOYMENT_TARGET}:" \ cc_wrapper.sh.template > cc_wrapper.sh chmod +x cc_wrapper.sh sed -e "s:\${CLANG}:${CC_FOR_BUILD}:" \ -e "s:\${target_platform}:${target_platform}:" \ -e "s:\${INSTALL_NAME_TOOL}:${INSTALL_NAME_TOOL//${HOST}/${BUILD}}:" \ -e "s:\${CONDA_BUILD_SYSROOT}:${CONDA_BUILD_SYSROOT}:" \ + -e "s:\${MACOSX_SDK_VERSION}:${MACOSX_SDK_VERSION}:" \ + -e "s:\${MACOSX_DEPLOYMENT_TARGET}:${MACOSX_DEPLOYMENT_TARGET}:" \ cc_wrapper.sh.template > cc_wrapper_build.sh chmod +x cc_wrapper.sh + chmod +x cc_wrapper_build.sh export BAZEL_TOOLCHAIN_GCC="cc_wrapper.sh" export BAZEL_TOOLCHAIN_LIBCXX="c++" export BAZEL_TOOLCHAIN_AR=${LIBTOOL} @@ -104,10 +116,13 @@ pushd custom_toolchain # export BUILD_CPU="darwin" # fi #fi - + sed -ie "s:TARGET_CPU:${TARGET_CPU}:" BUILD sed -ie "s:BUILD_CPU:${BUILD_CPU}:" BUILD + # save HOST_PREFIX before setting PREFIX to be BUILD_PREFIX (in cross-compilation). + HOST_PREFIX=${PREFIX} + cp cc_toolchain_config.bzl cc_toolchain_build_config.bzl apply_cc_template cc_toolchain_config.bzl apply_cc_template crosstool_wrapper_driver_is_not_gcc @@ -123,10 +138,10 @@ pushd custom_toolchain target_platform=${build_platform} PREFIX=${BUILD_PREFIX} LD=${LD//${HOST}/${BUILD}} - CFLAGS=${CFLAGS//${PREFIX}/${BUILD_PREFIX}} - CPPFLAGS=${CPPFLAGS//${PREFIX}/${BUILD_PREFIX}} - CXXFLAGS=${CXXFLAGS//${PREFIX}/${BUILD_PREFIX}} - LDFLAGS=${LDFLAGS//${PREFIX}/${BUILD_PREFIX}} + CFLAGS=${CFLAGS//${HOST_PREFIX}/${BUILD_PREFIX}} + CPPFLAGS=${CPPFLAGS//${HOST_PREFIX}/${BUILD_PREFIX}} + CXXFLAGS=${CXXFLAGS//${HOST_PREFIX}/${BUILD_PREFIX}} + LDFLAGS=${LDFLAGS//${HOST_PREFIX}/${BUILD_PREFIX}} NM=${NM//${HOST}/${BUILD}} STRIP=${STRIP//${HOST}/${BUILD}} BAZEL_TOOLCHAIN_AR=${BAZEL_TOOLCHAIN_AR//${HOST}/${BUILD}} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 38e1ffa52..1b9316a94 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ -{% set version = "2.7.1" %} -{% set estimator_version = "2.7.0" %} +{% set version = "2.8.1" %} +{% set estimator_version = "2.8.0" %} package: name: tensorflow-split @@ -7,16 +7,12 @@ package: source: - url: https://github.com/tensorflow/tensorflow/archive/refs/tags/v{{ version }}.tar.gz - sha256: abebe2cf5ca379e18071693ca5f45b88ade941b16258a21cc1f12d77d5387a21 + sha256: 4b487a63d6f0c1ca46a2ac37ba4687eabdc3a260c222616fa414f6df73228cec patches: - - patches/0001-relax-tolerence-in-special_math_test.patch - - patches/0002-skip-read-only-debugger_cli_common-test.patch - - patches/0003-relax-precision-in-matrix_log_op_test.patch - # requires setting GRPCIO_VERSION in build script - - patches/0004-loosen-requirements.patch - - patches/0005-Replace-deprecated-absl-Status-error_message-call-wi.patch + - patches/0001-loosen-requirements.patch + - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ estimator_version }}.tar.gz - sha256: e5164e802638d3cf110ecc17912be9d514a9d3354ec48e77200b9403dcc15965 + sha256: 58a2c3562ca6491c257e9a4d9bd8825667883257edcdb452181efa691c586b17 folder: tensorflow-estimator build: @@ -28,7 +24,18 @@ requirements: build: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - - numpy # [build_platform != target_platform] + - nsync # [build_platform != target_platform] + - snappy # [build_platform != target_platform] + - giflib # [build_platform != target_platform] + - jpeg # [build_platform != target_platform] + - icu # [build_platform != target_platform] + - libpng # [build_platform != target_platform] + - flatbuffers <2.0.6 # [build_platform != target_platform] + - onednn # [build_platform != target_platform] + - onednn-cpu-threadpool # [build_platform != target_platform] + - pybind11 # [build_platform != target_platform] + - numpy 1.20.* # [py<310 and (build_platform != target_platform)] + - numpy 1.21.* # [py>=310 and (build_platform != target_platform)] - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] @@ -37,7 +44,7 @@ requirements: - libprotobuf - nasm - sed - - rsync # [linux] + - rsync # realpath is not available from the docker image for cuda <= 10.2 # so we install coreutils here - coreutils # [cuda_compiler_version != "None"] @@ -88,22 +95,22 @@ requirements: # github.com/tensorflow/tensorflow/blob/v{{ version }}/tensorflow/tools/pip_package/setup.py - absl-py >=0.4.0 - astunparse >=1.6.0 - - gast >=0.2.1,<0.5.0 + - gast >=0.2.1 - google-pasta >=0.1.1 - h5py >=2.9.0 - keras-preprocessing >=1.1.1 - - numpy + - numpy 1.20.* # [py<310] + - numpy 1.21.* # [py>=310] - opt_einsum >=2.3.2 - protobuf >=3.9.2 - - python-flatbuffers >=1.12,<3 + - python-flatbuffers >=1.12 - six >=1.12 - termcolor >=1.1.0 - typing_extensions >=3.6.6 - wrapt >=1.11.0 # TF-API needs to move in sync - # XXX: actually, TF 2.7.0 still demands tb 2.6 - - tensorboard >=2.6,<2.7 - - keras >=2.7,<2.8 + - tensorboard >=2.8,<2.9 + - keras >=2.8,<2.9 outputs: # 2021/12/29: hmaarrfk @@ -168,23 +175,23 @@ outputs: - google-pasta >=0.1.1 - h5py >=2.9.0 - keras-preprocessing >=1.1.1 - - numpy + - numpy 1.20.* # [py<310] + - numpy 1.21.* # [py>=310] - opt_einsum >=2.3.2 - protobuf >=3.9.2 - - python-flatbuffers >=1.12,<3 + - python-flatbuffers >=1.12 - six >=1.12 - termcolor >=1.1.0 - typing_extensions >=3.6.6 - wrapt >=1.11.0 # TF-API needs to move in sync - # XXX: actually, TF 2.7.0 still demands tb 2.6 - - tensorboard >=2.6,<2.7 - - keras >=2.7,<2.8 + - tensorboard >=2.8,<2.9 + - keras >=2.8,<2.9 run: - python - absl-py >=0.4.0 - astunparse >=1.6.0 - - gast >=0.2.1,<0.5.0 + - gast >=0.2.1 - google-pasta >=0.1.1 - grpcio {{ grpc_cpp }}.* - h5py >=2.9.0 @@ -192,22 +199,16 @@ outputs: - {{ pin_compatible('numpy') }} - opt_einsum >=2.3.2 - protobuf >=3.9.2 - - python-flatbuffers >=1.12,<3 + - python-flatbuffers >=1.12 - six >=1.12 - termcolor >=1.1.0 - typing_extensions >=3.6.6 - wrapt >=1.11.0 # TF-API needs to move in sync - # XXX: actually, TF 2.7.0 still demands tb 2.6 - - tensorboard >=2.6,<2.7 - - keras >=2.7,<2.8 + - tensorboard >=2.8,<2.9 + - keras >=2.8,<2.9 # avoid that people without GPUs needlessly download ~0.5-1GB - __cuda # [cuda_compiler_version != "None"] - # TODO: decide on the name of the package - # run_constrained: - # What is the difference between these two packages? - # - tensorflow-io-gcs-filesystem >=0.21.0 - # - tensorflow-io >=0.21.0 - name: tensorflow build: @@ -278,10 +279,11 @@ outputs: commands: - pip check + - name: libtensorflow script: cp_libtensorflow.sh build: - skip: true # [not linux] + skip: true # [win] string: cuda{{ cuda_compiler_version | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] string: cpu_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] run_exports: @@ -298,6 +300,7 @@ outputs: - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] # host requirements to pick up run_exports host: + - abseil-cpp 20210324.2 - giflib - grpc-cpp - icu @@ -319,13 +322,13 @@ outputs: requires: - {{ compiler('c') }} commands: - - test -f $PREFIX/lib/libtensorflow.so # [not win and cuda_compiler_version == "None"] - - ./test_libtensorflow.sh # [not win and cuda_compiler_version == "None"] + - test -f $PREFIX/lib/libtensorflow${SHLIB_EXT} # [not win and cuda_compiler_version == "None"] + - ./test_libtensorflow.sh # [not win and cuda_compiler_version == "None"] - name: libtensorflow_cc script: cp_libtensorflow_cc.sh build: - skip: true # [not linux] + skip: true # [win] string: cuda{{ cuda_compiler_version | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] string: cpu_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] run_exports: @@ -342,6 +345,7 @@ outputs: - {{ compiler('cuda') }} # [cuda_compiler_version != "None"] # host requirements to pick up run_exports host: + - abseil-cpp 20210324.2 - giflib - grpc-cpp - icu @@ -363,8 +367,8 @@ outputs: requires: - {{ compiler('cxx') }} commands: - - test -f $PREFIX/lib/libtensorflow_cc.so # [not win and cuda_compiler_version == "None"] - - ./test_libtensorflow_cc.sh # [not win and cuda_compiler_version == "None"] + - test -f $PREFIX/lib/libtensorflow_cc${SHLIB_EXT} # [not win and cuda_compiler_version == "None"] + - ./test_libtensorflow_cc.sh # [not win and cuda_compiler_version == "None"] # 2021/08/01, hmaarrfk # While this seems like a roundabout way of defining the package name diff --git a/recipe/patches/0001-loosen-requirements.patch b/recipe/patches/0001-loosen-requirements.patch new file mode 100644 index 000000000..721b37d40 --- /dev/null +++ b/recipe/patches/0001-loosen-requirements.patch @@ -0,0 +1,41 @@ +From 2b14b3c38210f8454894cec887915820a28b3ef8 Mon Sep 17 00:00:00 2001 +From: "Uwe L. Korn" +Date: Thu, 30 Dec 2021 06:57:09 +0200 +Subject: [PATCH] loosen requirements + +* Remove unused libclang requirement +* Remove unecessary tensorflow-io-gcs-filesystem +* Updated for 2.8.0 by ngam + +Co-authored-by: Mark Harfouche +--- + tensorflow/tools/pip_package/setup.py | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py +index 58de3ad9c40..b1194d6948e 100644 +--- a/tensorflow/tools/pip_package/setup.py ++++ b/tensorflow/tools/pip_package/setup.py +@@ -78,7 +78,6 @@ REQUIRED_PACKAGES = [ + 'google_pasta >= 0.1.1', + 'h5py >= 2.9.0', + 'keras_preprocessing >= 1.1.1', # 1.1.0 needs tensorflow==1.7 +- 'libclang >= 9.0.1', + 'numpy >= 1.20', + 'opt_einsum >= 2.3.2', + 'protobuf >= 3.9.2', +@@ -92,9 +91,8 @@ REQUIRED_PACKAGES = [ + # They are updated during the release process + # When updating these, please also update the nightly versions below + 'tensorboard >= 2.8, < 2.9', +- 'tensorflow-estimator >= 2.8, < 2.9', +- 'keras >= 2.8.0rc0, < 2.9', +- 'tensorflow-io-gcs-filesystem >= 0.23.1', ++ 'tensorflow_estimator == 2.8.1', ++ 'keras >= 2.8, < 2.9', + ] + + +-- +2.35.0 + diff --git a/recipe/patches/0001-relax-tolerence-in-special_math_test.patch b/recipe/patches/0001-relax-tolerence-in-special_math_test.patch deleted file mode 100644 index bd4d5df9d..000000000 --- a/recipe/patches/0001-relax-tolerence-in-special_math_test.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 21677ffb7d4de4660f4c2c03a04a13a13828355c Mon Sep 17 00:00:00 2001 -From: Jonathan Helmus -Date: Tue, 20 Jun 2017 15:13:14 -0500 -Subject: [PATCH 1/5] relax tolerence in special_math_test - ---- - .../python/kernel_tests/distributions/special_math_test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tensorflow/python/kernel_tests/distributions/special_math_test.py b/tensorflow/python/kernel_tests/distributions/special_math_test.py -index 4041a7e1a79..4418b4a3212 100644 ---- a/tensorflow/python/kernel_tests/distributions/special_math_test.py -+++ b/tensorflow/python/kernel_tests/distributions/special_math_test.py -@@ -256,7 +256,7 @@ class LogNdtrTestUpper(NdtrTest): - min=sm.LOGNDTR_FLOAT64_UPPER, - max=35., # Beyond this, log_cdf(x) may be zero. - shape=[100]) -- _error32 = ErrorSpec(rtol=1e-6, atol=1e-14) -+ _error32 = ErrorSpec(rtol=1e-6, atol=1e-13) - _error64 = ErrorSpec(rtol=1e-6, atol=1e-14) - - --- -2.32.0.windows.2 - diff --git a/recipe/patches/0002-skip-read-only-debugger_cli_common-test.patch b/recipe/patches/0002-skip-read-only-debugger_cli_common-test.patch deleted file mode 100644 index 0ccc13b19..000000000 --- a/recipe/patches/0002-skip-read-only-debugger_cli_common-test.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a047e1572d7bc5f1658b2fb771fca724c8b91764 Mon Sep 17 00:00:00 2001 -From: Jonathan Helmus -Date: Thu, 4 Jan 2018 17:17:23 -0600 -Subject: [PATCH 2/5] skip read only debugger_cli_common test - -If tensorflow is built as root the -debugger_cli_common::testCommandHistoryHandlesWritingIOErrorGracoiusly test -will fail as the log never becomes read only. Skip the portion of the test -that depends on the read-only behavior of the log. ---- - tensorflow/python/debug/cli/debugger_cli_common_test.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tensorflow/python/debug/cli/debugger_cli_common_test.py b/tensorflow/python/debug/cli/debugger_cli_common_test.py -index 93df845c4c5..814ddf13a16 100644 ---- a/tensorflow/python/debug/cli/debugger_cli_common_test.py -+++ b/tensorflow/python/debug/cli/debugger_cli_common_test.py -@@ -1057,7 +1057,9 @@ class CommandHistoryTest(test_util.TensorFlowTestCase): - - cmd_hist_3 = debugger_cli_common.CommandHistory( - limit=3, history_file_path=self._history_file_path) -- self.assertEqual(["help"], cmd_hist_3.most_recent_n(1)) -+ # when the test are run as root the log file is still writable and this -+ # test fails. -+ #self.assertEqual(["help"], cmd_hist_3.most_recent_n(1)) - - self._restoreFileReadWritePermissions(self._history_file_path) - --- -2.32.0.windows.2 - diff --git a/recipe/patches/0002-update-tensorflow-io-workspace-for-rules_python-0.5.0.patch b/recipe/patches/0002-update-tensorflow-io-workspace-for-rules_python-0.5.0.patch new file mode 100644 index 000000000..c5538dd84 --- /dev/null +++ b/recipe/patches/0002-update-tensorflow-io-workspace-for-rules_python-0.5.0.patch @@ -0,0 +1,45 @@ +From d1119bbcfff7963d387ff8da0b6cd040e1ffe002 Mon Sep 17 00:00:00 2001 +From: gandhimathi anand +Date: Sat, 12 Feb 2022 21:56:54 -0800 +Subject: [PATCH] update WORKSPACE for latest rules_python 0.5.0 + +--- + WORKSPACE | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +diff --git a/WORKSPACE b/WORKSPACE +index 6d918ea1..8fb3ac58 100644 +--- a/WORKSPACE ++++ b/WORKSPACE +@@ -94,24 +94,19 @@ switched_rules_by_language( + # Note rules_python is placed earlier as tensorflow's version is older + http_archive( + name = "rules_python", +- sha256 = "aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161", ++ sha256 = "cd6730ed53a002c56ce4e2f396ba3b3be262fd7cb68339f0377a45e8227fe332", + urls = [ +- "https://storage.googleapis.com/mirror.tensorflow.org/github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz", +- "https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz", ++ "https://storage.googleapis.com/mirror.tensorflow.org/github.com/bazelbuild/rules_python/releases/download/0.5.0/rules_python-0.5.0.tar.gz", ++ "https://github.com/bazelbuild/rules_python/releases/download/0.5.0/rules_python-0.5.0.tar.gz", + ], + ) + +-load("@rules_python//python:pip.bzl", "pip_import") ++load("@rules_python//python:pip.bzl", "pip_install") + +-pip_import( +- name = "lint_dependencies", ++pip_install( + requirements = "//tools/lint:requirements.txt", + ) + +-load("@lint_dependencies//:requirements.bzl", "pip_install") +- +-pip_install() +- + http_archive( + name = "org_tensorflow", + sha256 = "66b953ae7fba61fd78969a2e24e350b26ec116cf2e6a7eb93d02c63939c6f9f7", +-- +2.25.1 diff --git a/recipe/patches/0003-relax-precision-in-matrix_log_op_test.patch b/recipe/patches/0003-relax-precision-in-matrix_log_op_test.patch deleted file mode 100644 index 6a1450518..000000000 --- a/recipe/patches/0003-relax-precision-in-matrix_log_op_test.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5b9c6d80a8ce64bc8f7ed279920728019f579cc1 Mon Sep 17 00:00:00 2001 -From: Jonathan Helmus -Date: Mon, 20 Aug 2018 12:19:04 -0500 -Subject: [PATCH 3/5] relax precision in matrix_log_op_test - ---- - tensorflow/python/kernel_tests/matrix_logarithm_op_test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tensorflow/python/kernel_tests/matrix_logarithm_op_test.py b/tensorflow/python/kernel_tests/matrix_logarithm_op_test.py -index 5004a9c5588..62c2bfe1abe 100644 ---- a/tensorflow/python/kernel_tests/matrix_logarithm_op_test.py -+++ b/tensorflow/python/kernel_tests/matrix_logarithm_op_test.py -@@ -45,7 +45,7 @@ class LogarithmOpTest(test.TestCase): - tf_ans = linalg_impl.matrix_exponential( - gen_linalg_ops.matrix_logarithm(inp)) - out = self.evaluate(tf_ans) -- self.assertAllClose(inp, out, rtol=1e-4, atol=1e-3) -+ self.assertAllClose(inp, out, rtol=1e-3, atol=1e-3) - - def _verifyLogarithmComplex(self, x): - for np_type in [np.complex64, np.complex128]: --- -2.32.0.windows.2 - diff --git a/recipe/patches/0004-loosen-requirements.patch b/recipe/patches/0004-loosen-requirements.patch deleted file mode 100644 index 0a22769f2..000000000 --- a/recipe/patches/0004-loosen-requirements.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b6371c3abefb0ab2b3e943f43088ab42fac9c5bc Mon Sep 17 00:00:00 2001 -From: "Uwe L. Korn" -Date: Thu, 30 Dec 2021 06:57:09 +0200 -Subject: [PATCH] Fixup requirements - -* Remove unused libclang requirement -* Remove unused wheel requirement -* Remove unecessary tensorflow-io-gcs-filesystem - -Co-authored-by: Mark Harfouche ---- - tensorflow/tools/pip_package/setup.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index 26306e43aaf..60cefcad10d 100644 ---- a/tensorflow/tools/pip_package/setup.py -+++ b/tensorflow/tools/pip_package/setup.py -@@ -82,7 +82,6 @@ REQUIRED_PACKAGES = [ - # Install other dependencies - 'absl-py >= 0.4.0', - 'astunparse >= 1.6.0', -- 'libclang >= 9.0.1', - 'flatbuffers >= 1.12, < 3.0', # capped as jax 0.1.71 needs < 3.0 - 'google_pasta >= 0.1.1', - 'h5py >= 2.9.0', # capped since 3.3.0 lacks py3.6 -@@ -92,7 +91,6 @@ REQUIRED_PACKAGES = [ - 'six >= 1.12.0', - 'termcolor >= 1.1.0', - 'typing_extensions >= 3.6.6', -- 'wheel >= 0.32.0, < 1.0', # capped as astunparse 1.6.0-1.6.3 requires < 1.0 - 'wrapt >= 1.11.0', - # These packages need to be pinned exactly as newer versions are - # incompatible with the rest of the ecosystem -@@ -106,7 +104,6 @@ REQUIRED_PACKAGES = [ - # Keras release is not backward compatible with old tf release, and we have - # to make the version aligned between TF and Keras. - 'keras >= 2.7.0rc0, < 2.8', -- 'tensorflow-io-gcs-filesystem >= 0.21.0', - ] - - - diff --git a/recipe/patches/0005-Replace-deprecated-absl-Status-error_message-call-wi.patch b/recipe/patches/0005-Replace-deprecated-absl-Status-error_message-call-wi.patch deleted file mode 100644 index 05e5c5869..000000000 --- a/recipe/patches/0005-Replace-deprecated-absl-Status-error_message-call-wi.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6b6e31e057a070942f9eb3acba7578be517bb173 Mon Sep 17 00:00:00 2001 -From: Zachary Garrett -Date: Mon, 27 Sep 2021 08:40:23 -0700 -Subject: [PATCH 5/5] Replace deprecated `absl::Status::error_message` call - with `absl::Status::message`. - -PiperOrigin-RevId: 399198325 -Change-Id: Ib4a5e1d3a5e1447fefe9de428946341522a021a4 ---- - tensorflow/core/kernels/example_parsing_ops.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tensorflow/core/kernels/example_parsing_ops.cc b/tensorflow/core/kernels/example_parsing_ops.cc -index a1265cfb5c6..ada919bbd7b 100644 ---- a/tensorflow/core/kernels/example_parsing_ops.cc -+++ b/tensorflow/core/kernels/example_parsing_ops.cc -@@ -1218,7 +1218,7 @@ class DecodeJSONExampleOp : public OpKernel { - resolver_.get(), "type.googleapis.com/tensorflow.Example", &in, &out); - OP_REQUIRES(ctx, status.ok(), - errors::InvalidArgument("Error while parsing JSON: ", -- string(status.error_message()))); -+ string(status.message()))); - } - } - --- -2.32.0.windows.2 - diff --git a/recipe/patches/0007-relax_six_requirement.patch b/recipe/patches/0007-relax_six_requirement.patch deleted file mode 100644 index 1701ddaeb..000000000 --- a/recipe/patches/0007-relax_six_requirement.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index b4a0c5dbce0..d62ac19a39e 100644 ---- a/tensorflow/tools/pip_package/setup.py -+++ b/tensorflow/tools/pip_package/setup.py -@@ -89,7 +89,7 @@ REQUIRED_PACKAGES = [ - 'keras_preprocessing ~= 1.1.2', - 'opt_einsum ~= 3.3.0', - 'protobuf >= 3.9.2', -- 'six ~= 1.15.0', -+ 'six >= 1.15.0', - 'termcolor ~= 1.1.0', - 'typing_extensions ~= 3.7.4', - 'wheel ~= 0.35', - diff --git a/recipe/test_libtensorflow.sh b/recipe/test_libtensorflow.sh index c5ca3e089..828df8c64 100755 --- a/recipe/test_libtensorflow.sh +++ b/recipe/test_libtensorflow.sh @@ -2,5 +2,5 @@ set -euxo pipefail -$CC -o test_c -L${PREFIX}/lib/ -ltensorflow -I${PREFIX}/include/ test_c.c +${CC} ${CFLAGS} ${LDFLAGS} -o test_c test_c.c -ltensorflow ./test_c diff --git a/recipe/test_libtensorflow_cc.sh b/recipe/test_libtensorflow_cc.sh index e102dff53..6fdf23765 100755 --- a/recipe/test_libtensorflow_cc.sh +++ b/recipe/test_libtensorflow_cc.sh @@ -2,5 +2,8 @@ set -exuo pipefail -$CXX -std=c++14 -o test_cc -L${PREFIX}/lib/ -ltensorflow_cc -ltensorflow_framework -lrt -I${PREFIX}/include/ test_cc.cc +if [[ "${target_platform}" == linux-* ]]; then + export LDFLAGS="${LDFLAGS} -lrt" +fi +${CXX} ${CXXFLAGS} ${LDFLAGS} -o test_cc test_cc.cc -ltensorflow_cc -ltensorflow_framework ./test_cc
VariantStatus
linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.7.____cpythonlinux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.10.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.8.____cpythonlinux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.7.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.19python3.9.____cpythonlinux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.8.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10numpy1.21python3.10.____cpythonlinux_64_c_compiler_version10cuda_compiler_version11.1cudnn8cxx_compiler_version10python3.9.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.7.____cpythonlinux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.10.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.8.____cpythonlinux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.7.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.19python3.9.____cpythonlinux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.8.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10numpy1.21python3.10.____cpythonlinux_64_c_compiler_version10cuda_compiler_version11.2cudnn8cxx_compiler_version10python3.9.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.7.____cpythonlinux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.10.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.8.____cpythonlinux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.7.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.19python3.9.____cpythonlinux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.8.____cpython - variant + variant
linux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10numpy1.21python3.10.____cpythonlinux_64_c_compiler_version10cuda_compiler_versionNonecudnnundefinedcxx_compiler_version10python3.9.____cpython - variant + variant
linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.7.____cpythonlinux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.10.____cpython - variant + variant
linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.8.____cpythonlinux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.7.____cpython - variant + variant
linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.19python3.9.____cpythonlinux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.8.____cpython - variant + variant
linux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7numpy1.21python3.10.____cpythonlinux_64_c_compiler_version7cuda_compiler_version10.2cudnn7cxx_compiler_version7python3.9.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.7.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.10.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.8.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.7.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.19python3.9.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.8.____cpython - variant + variant
linux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9numpy1.21python3.10.____cpythonlinux_64_c_compiler_version9cuda_compiler_version11.0cudnn8cxx_compiler_version9python3.9.____cpython - variant + variant
osx_64_numpy1.19python3.7.____cpythonosx_64_python3.10.____cpython - variant + variant
osx_64_numpy1.19python3.8.____cpythonosx_64_python3.7.____cpython - variant + variant
osx_64_numpy1.19python3.9.____cpythonosx_64_python3.8.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonosx_64_python3.9.____cpython - variant + variant
osx_arm64_numpy1.19python3.8.____cpythonosx_arm64_python3.10.____cpython - variant + variant
osx_arm64_numpy1.19python3.9.____cpythonosx_arm64_python3.8.____cpython - variant + variant
osx_arm64_numpy1.21python3.10.____cpythonosx_arm64_python3.9.____cpython - variant + variant