- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10libgrpc1.54libprotobuf3.21numpy1.21python3.10.____cpython |
+ linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10libgrpc1.54libprotobuf3.21numpy1.21python3.8.____cpython |
+ linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10libgrpc1.54libprotobuf3.21numpy1.21python3.9.____cpython |
+ linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10libgrpc1.54libprotobuf3.21numpy1.23python3.11.____cpython |
+ linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10libgrpc1.56libprotobuf4.23.3numpy1.21python3.10.____cpython |
+ linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10libgrpc1.56libprotobuf4.23.3numpy1.21python3.8.____cpython |
+ linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10libgrpc1.56libprotobuf4.23.3numpy1.21python3.9.____cpython |
+ linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10libgrpc1.56libprotobuf4.23.3numpy1.23python3.11.____cpython |
+ linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12libgrpc1.54libprotobuf3.21numpy1.21python3.10.____cpython |
+ linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12libgrpc1.54libprotobuf3.21numpy1.21python3.8.____cpython |
+ linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12libgrpc1.54libprotobuf3.21numpy1.21python3.9.____cpython |
+ linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12libgrpc1.54libprotobuf3.21numpy1.23python3.11.____cpython |
+ linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12libgrpc1.56libprotobuf4.23.3numpy1.21python3.10.____cpython |
+ osx_64_numpy1.22python3.10.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12libgrpc1.56libprotobuf4.23.3numpy1.21python3.8.____cpython |
+ osx_64_numpy1.22python3.8.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12libgrpc1.56libprotobuf4.23.3numpy1.21python3.9.____cpython |
+ osx_64_numpy1.22python3.9.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12libgrpc1.56libprotobuf4.23.3numpy1.23python3.11.____cpython |
+ osx_64_numpy1.23python3.11.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12libgrpc1.54libprotobuf3.21numpy1.21python3.10.____cpython |
+ osx_arm64_numpy1.22python3.10.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12libgrpc1.54libprotobuf3.21numpy1.21python3.8.____cpython |
+ osx_arm64_numpy1.22python3.8.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12libgrpc1.54libprotobuf3.21numpy1.21python3.9.____cpython |
+ osx_arm64_numpy1.22python3.9.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12libgrpc1.54libprotobuf3.21numpy1.23python3.11.____cpython |
+ osx_arm64_numpy1.23python3.11.____cpython |
-
-
- |
-
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12libgrpc1.56libprotobuf4.23.3numpy1.21python3.10.____cpython |
-
-
-
-
- |
-
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12libgrpc1.56libprotobuf4.23.3numpy1.21python3.8.____cpython |
-
-
-
-
- |
-
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12libgrpc1.56libprotobuf4.23.3numpy1.21python3.9.____cpython |
-
-
-
-
- |
-
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12libgrpc1.56libprotobuf4.23.3numpy1.23python3.11.____cpython |
-
-
-
-
- |
-
- osx_64_libgrpc1.54libprotobuf3.21numpy1.21python3.10.____cpython |
-
-
-
-
- |
-
- osx_64_libgrpc1.54libprotobuf3.21numpy1.21python3.8.____cpython |
-
-
-
-
- |
-
- osx_64_libgrpc1.54libprotobuf3.21numpy1.21python3.9.____cpython |
-
-
-
-
- |
-
- osx_64_libgrpc1.54libprotobuf3.21numpy1.23python3.11.____cpython |
-
-
-
-
- |
-
- osx_64_libgrpc1.56libprotobuf4.23.3numpy1.21python3.10.____cpython |
-
-
-
-
- |
-
- osx_64_libgrpc1.56libprotobuf4.23.3numpy1.21python3.8.____cpython |
-
-
-
-
- |
-
- osx_64_libgrpc1.56libprotobuf4.23.3numpy1.21python3.9.____cpython |
-
-
-
-
- |
-
- osx_64_libgrpc1.56libprotobuf4.23.3numpy1.23python3.11.____cpython |
-
-
-
-
- |
-
- osx_arm64_libgrpc1.54libprotobuf3.21numpy1.21python3.10.____cpython |
-
-
-
-
- |
-
- osx_arm64_libgrpc1.54libprotobuf3.21numpy1.21python3.8.____cpython |
-
-
-
-
- |
-
- osx_arm64_libgrpc1.54libprotobuf3.21numpy1.21python3.9.____cpython |
-
-
-
-
- |
-
- osx_arm64_libgrpc1.54libprotobuf3.21numpy1.23python3.11.____cpython |
-
-
-
-
- |
-
- osx_arm64_libgrpc1.56libprotobuf4.23.3numpy1.21python3.10.____cpython |
-
-
-
-
- |
-
- osx_arm64_libgrpc1.56libprotobuf4.23.3numpy1.21python3.8.____cpython |
-
-
-
-
- |
-
- osx_arm64_libgrpc1.56libprotobuf4.23.3numpy1.21python3.9.____cpython |
-
-
-
-
- |
-
- osx_arm64_libgrpc1.56libprotobuf4.23.3numpy1.23python3.11.____cpython |
-
-
-
+
|
From 0a63c5a962451b4da99a9948323d8b3ed462f461 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Fri, 15 Sep 2023 17:35:40 +0200
Subject: [PATCH 12/28] Fix dproto duplicate loading
---
recipe/build.sh | 2 +-
recipe/meta.yaml | 1 +
...layout_proto_cc-if-protobuf-linkage-.patch | 24 +++++++++++++++++++
3 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 recipe/patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
diff --git a/recipe/build.sh b/recipe/build.sh
index 006822d1..a6b5a84b 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -4,7 +4,7 @@ set -ex
# Make libprotobuf-python-headers visible for pybind11_protobuf
# These files will be deleted at the end of the build.
-mkdir $PREFIX/include/python
+mkdir -p $PREFIX/include/python
cp -r $PREFIX/include/google $PREFIX/include/python/
sed -i "s;@@PREFIX@@;$PREFIX;" third_party/pybind11_protobuf/0001-Add-Python-include-path.patch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 7b564ecf..34941960 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -19,6 +19,7 @@ source:
- patches/0008-Use-basename-instead-of-realpath.patch
- patches/0009-Fix-protobuf_python-for-systemlibs.patch
- patches/0010-Add-absl_log-systemlib.patch
+ - patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
- url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz
sha256: 4175e9276a1eb8b5e4e876d228e4605871832e7bd8517965d6a47f1481af2c3e
diff --git a/recipe/patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
new file mode 100644
index 00000000..1e31c1e45
--- /dev/null
+++ b/recipe/patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
@@ -0,0 +1,24 @@
+From 246cf18d89a14752cb0a5589ea74b6759f4ca142 Mon Sep 17 00:00:00 2001
+From: "Uwe L. Korn"
+Date: Fri, 15 Sep 2023 11:06:27 +0200
+Subject: [PATCH] Omit linking to layout_proto_cc if protobuf linkage is shared
+
+---
+ tensorflow/python/BUILD | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
+index e71da3f9..af5ddda3 100644
+--- a/tensorflow/python/BUILD
++++ b/tensorflow/python/BUILD
+@@ -4407,7 +4407,6 @@ tf_python_pybind_extension(
+ features = ["-layering_check"],
+ deps = [
+ ":pywrap_densor_device_headers",
+- "//tensorflow/dtensor/proto:layout_proto_cc",
+ "//tensorflow/python/lib/core:pybind11_lib",
+ "//tensorflow/python/lib/core:pybind11_status_headers",
+ "//third_party/python_runtime:headers", # buildcleaner: keep
+--
+2.39.2 (Apple Git-143)
+
From 7dc53f75f77748469387262effc4d632060ad326 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Fri, 15 Sep 2023 17:35:54 +0200
Subject: [PATCH 13/28] Link to absl_status
---
recipe/test_libtensorflow.sh | 2 +-
recipe/test_libtensorflow_cc.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipe/test_libtensorflow.sh b/recipe/test_libtensorflow.sh
index 828df8c6..75a9ce81 100755
--- a/recipe/test_libtensorflow.sh
+++ b/recipe/test_libtensorflow.sh
@@ -2,5 +2,5 @@
set -euxo pipefail
-${CC} ${CFLAGS} ${LDFLAGS} -o test_c test_c.c -ltensorflow
+${CC} ${CFLAGS} ${LDFLAGS} -o test_c test_c.c -ltensorflow -labsl_status
./test_c
diff --git a/recipe/test_libtensorflow_cc.sh b/recipe/test_libtensorflow_cc.sh
index a486ac4a..f0e20086 100755
--- a/recipe/test_libtensorflow_cc.sh
+++ b/recipe/test_libtensorflow_cc.sh
@@ -6,5 +6,5 @@ if [[ "${target_platform}" == linux-* ]]; then
export LDFLAGS="${LDFLAGS} -lrt"
fi
export CXXFLAGS="${CXXFLAGS} -std=c++17"
-${CXX} ${CXXFLAGS} ${LDFLAGS} -o test_cc test_cc.cc -ltensorflow_cc -ltensorflow_framework
+${CXX} ${CXXFLAGS} ${LDFLAGS} -o test_cc test_cc.cc -ltensorflow_cc -ltensorflow_framework -labsl_status
./test_cc
From b60dbe68fac1fefdebc34111a57b3f9c0a919d0c Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Fri, 15 Sep 2023 17:37:24 +0200
Subject: [PATCH 14/28] MNT: Re-rendered with conda-build 3.26.1, conda-smithy
3.25.1, and conda-forge-pinning 2023.09.15.15.28.21
---
.../migrations/libprotobuf4233_libgrpc156.yaml | 11 -----------
1 file changed, 11 deletions(-)
delete mode 100644 .ci_support/migrations/libprotobuf4233_libgrpc156.yaml
diff --git a/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml b/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml
deleted file mode 100644
index 5fd03406..00000000
--- a/.ci_support/migrations/libprotobuf4233_libgrpc156.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-__migrator:
- build_number: 1
- kind: version
- migration_number: 1
-libgrpc:
-- '1.54'
-- '1.56'
-libprotobuf:
-- '3.21'
-- '4.23.3'
-migrator_ts: 1688154716.9176981
From 40a8373fe0ac8bb724def33a942b9bff629c9394 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Sun, 17 Sep 2023 21:37:38 +0200
Subject: [PATCH 15/28] Update recipe/meta.yaml
Co-authored-by: Mark Harfouche
---
recipe/meta.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 34941960..bdf70fd4 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -32,6 +32,7 @@ build:
requirements:
build:
+ - perl # [linux]
- python # [build_platform != target_platform]
- cython # [build_platform != target_platform]
- cross-python_{{ target_platform }} # [build_platform != target_platform]
From 1b7342bb7c2df3ffc0c83b0ba4e5ba2d26ac8c77 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Mon, 18 Sep 2023 14:47:57 +0000
Subject: [PATCH 16/28] Fix further abseil linkages
---
recipe/meta.yaml | 1 +
.../0001-Fix-further-abseil-linkage.patch | 60 +++++++++++++++++++
2 files changed, 61 insertions(+)
create mode 100644 recipe/patches/0001-Fix-further-abseil-linkage.patch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index bdf70fd4..32a4e3a9 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -20,6 +20,7 @@ source:
- patches/0009-Fix-protobuf_python-for-systemlibs.patch
- patches/0010-Add-absl_log-systemlib.patch
- patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
+ - patches/0001-Fix-further-abseil-linkage.patch
- url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz
sha256: 4175e9276a1eb8b5e4e876d228e4605871832e7bd8517965d6a47f1481af2c3e
diff --git a/recipe/patches/0001-Fix-further-abseil-linkage.patch b/recipe/patches/0001-Fix-further-abseil-linkage.patch
new file mode 100644
index 00000000..fe5f2433
--- /dev/null
+++ b/recipe/patches/0001-Fix-further-abseil-linkage.patch
@@ -0,0 +1,60 @@
+From a48220c76f0288178ff38d534015bf01c39733a8 Mon Sep 17 00:00:00 2001
+From: "Uwe L. Korn"
+Date: Mon, 18 Sep 2023 14:47:08 +0000
+Subject: [PATCH] Fix further abseil linkage
+
+---
+ third_party/absl/system.absl.base.BUILD | 12 ++++++++++--
+ third_party/absl/system.absl.log.BUILD | 3 +++
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD
+index d6bf8748..f6b62c9f 100644
+--- a/third_party/absl/system.absl.base.BUILD
++++ b/third_party/absl/system.absl.base.BUILD
+@@ -17,12 +17,20 @@ package(default_visibility = ["//visibility:public"])
+
+ cc_library(
+ name = "log_severity",
+- linkopts = ["-labsl_log_severity"],
++ linkopts = [
++ "-labsl_log_severity",
++ "-labsl_log_internal_message",
++ "-labsl_log_internal_nullguard",
++ ],
+ )
+
+ cc_library(
+ name = "raw_logging_internal",
+- linkopts = ["-labsl_raw_logging_internal"],
++ linkopts = [
++ "-labsl_raw_logging_internal",
++ "-labsl_log_internal_message",
++ "-labsl_log_internal_nullguard",
++ ],
+ visibility = [
+ "//absl:__subpackages__",
+ ],
+diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD
+index 9df9d3ce..89047c7d 100644
+--- a/third_party/absl/system.absl.log.BUILD
++++ b/third_party/absl/system.absl.log.BUILD
+@@ -6,6 +6,8 @@ cc_library(
+ name = "log",
+ linkopts = [
+ "-labsl_log_internal_conditions",
++ "-labsl_log_internal_message",
++ "-labsl_log_internal_nullguard",
+ ],
+ )
+
+@@ -14,5 +16,6 @@ cc_library(
+ linkopts = [
+ "-labsl_log_internal_check_op",
+ "-labsl_log_internal_message",
++ "-labsl_log_internal_nullguard",
+ ],
+ )
+--
+2.30.2
+
From 1b3fe06c3ded1c5e6d7bd012de7bc1ee3139aa7e Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Mon, 18 Sep 2023 14:52:34 +0000
Subject: [PATCH 17/28] MNT: Re-rendered with conda-build 3.25.0, conda-smithy
3.25.1, and conda-forge-pinning 2023.09.17.11.00.01
---
....2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml | 2 ++
...1.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml | 2 ++
...1.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml | 2 ++
....2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml | 2 ++
...necxx_compiler_version12numpy1.22python3.10.____cpython.yaml | 2 ++
...onecxx_compiler_version12numpy1.22python3.8.____cpython.yaml | 2 ++
...onecxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 2 ++
...necxx_compiler_version12numpy1.23python3.11.____cpython.yaml | 2 ++
....0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml | 2 ++
...2.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml | 2 ++
...2.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 2 ++
....0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml | 2 ++
12 files changed, 24 insertions(+)
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
index 36745844..45b25805 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.22'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
index 81723ae3..77a168cd 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.22'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
index 214f2aba..2fdf1382 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.22'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
index 28cf0678..9be3a107 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.23'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
index 3564c2ec..e84350a6 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.22'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
index d9d8d46e..9df06c69 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.22'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
index 3614cf85..87814985 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.22'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
index 1550329f..2dd80c0d 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.23'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml
index 0335fec5..b3b0020e 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.22'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml
index c79111e7..ce6e4a64 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.22'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml
index 1a2be273..185ae76c 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.22'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml
index 89ab6ba1..51daffe0 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml
@@ -44,6 +44,8 @@ numpy:
- '1.23'
openssl:
- '3'
+perl:
+- 5.32.1
pin_run_as_build:
python:
min_pin: x.x
From 75e13696c34c03aa3332e1b6d7075da7bf18ba0b Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Tue, 19 Sep 2023 07:28:49 +0000
Subject: [PATCH 18/28] Drop CUDA 12 migration
---
.ci_support/migrations/cuda120.yaml | 80 -----------------------------
1 file changed, 80 deletions(-)
delete mode 100644 .ci_support/migrations/cuda120.yaml
diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml
deleted file mode 100644
index 17b77c9c..00000000
--- a/.ci_support/migrations/cuda120.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-migrator_ts: 1682985063
-__migrator:
- kind:
- version
- migration_number:
- 1
- build_number:
- 1
- paused: false
- override_cbc_keys:
- - cuda_compiler_stub
- operation: key_add
- check_solvable: false
- primary_key: cuda_compiler_version
- ordering:
- cxx_compiler_version:
- - 9
- - 8
- - 7
- c_compiler_version:
- - 9
- - 8
- - 7
- fortran_compiler_version:
- - 9
- - 8
- - 7
- docker_image:
- - quay.io/condaforge/linux-anvil-comp7 # [os.environ.get("BUILD_PLATFORM") == "linux-64"]
- - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
- - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
- - quay.io/condaforge/linux-anvil-armv7l # [os.environ.get("BUILD_PLATFORM") == "linux-armv7l"]
- - quay.io/condaforge/linux-anvil-cuda:9.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- - quay.io/condaforge/linux-anvil-cuda:10.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- - quay.io/condaforge/linux-anvil-cuda:10.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- - quay.io/condaforge/linux-anvil-cuda:10.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- - quay.io/condaforge/linux-anvil-cuda:11.0 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- - quay.io/condaforge/linux-anvil-cuda:11.1 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- - quay.io/condaforge/linux-anvil-cuda:11.2 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- 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"]
- - 12.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- commit_message: |
- Rebuild for CUDA 12
-
- The transition to CUDA 12 SDK includes new packages for all CUDA libraries and
- build tools. Notably, the cudatoolkit package no longer exists, and packages
- should depend directly on the specific CUDA libraries (libcublas, libcusolver,
- etc) as needed. For an in-depth overview of the changes and to report problems
- [see this issue]( https://github.com/conda-forge/conda-forge.github.io/issues/1963 ).
- Please feel free to raise any issues encountered there. Thank you! :pray:
-
-cuda_compiler: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- - cuda-nvcc # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-cuda_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- - 12.0 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-c_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- - 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-cxx_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- - 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-fortran_compiler_version: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- - 12 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-cudnn: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- - 8 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-cdt_name: # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- - cos7 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-
-docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-") and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- - quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
From 0fee83db6f9cb76fea7759fae8e90f52702f45a2 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Tue, 19 Sep 2023 08:11:54 +0000
Subject: [PATCH 19/28] MNT: Re-rendered with conda-build 3.25.0, conda-smithy
3.25.1, and conda-forge-pinning 2023.09.19.00.40.39
---
.azure-pipelines/azure-pipelines-linux.yml | 48 ++++--------
...ion10numpy1.22python3.10.____cpython.yaml} | 0
...sion10numpy1.22python3.8.____cpython.yaml} | 0
...sion10numpy1.22python3.9.____cpython.yaml} | 0
...ion10numpy1.23python3.11.____cpython.yaml} | 0
...ion12numpy1.22python3.10.____cpython.yaml} | 0
...sion12numpy1.22python3.8.____cpython.yaml} | 0
...sion12numpy1.22python3.9.____cpython.yaml} | 0
...ion12numpy1.23python3.11.____cpython.yaml} | 0
...sion12numpy1.22python3.10.____cpython.yaml | 76 -------------------
...rsion12numpy1.22python3.8.____cpython.yaml | 76 -------------------
...rsion12numpy1.22python3.9.____cpython.yaml | 76 -------------------
...sion12numpy1.23python3.11.____cpython.yaml | 76 -------------------
README.md | 60 ++++-----------
14 files changed, 32 insertions(+), 380 deletions(-)
rename .ci_support/{linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml => linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml} (100%)
rename .ci_support/{linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml => linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml} (100%)
rename .ci_support/{linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml => linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml} (100%)
rename .ci_support/{linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml => linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml} (100%)
rename .ci_support/{linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml => linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml} (100%)
rename .ci_support/{linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml => linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml} (100%)
rename .ci_support/{linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml => linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml} (100%)
rename .ci_support/{linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml => linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml} (100%)
delete mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml
delete mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml
delete mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml
delete mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
index 46ebef78..e4d0439f 100755
--- a/.azure-pipelines/azure-pipelines-linux.yml
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -8,52 +8,36 @@ jobs:
vmImage: ubuntu-latest
strategy:
matrix:
- ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython
- : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython
+ linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython:
+ CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2
- ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython
- : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython
+ linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython:
+ CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2
- ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython
- : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython
+ linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython:
+ CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2
- ? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython
- : CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython
+ linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython:
+ CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2
- ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython
- : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython
+ linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython:
+ CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython
- : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython
+ linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython:
+ CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython
- : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython
+ linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython:
+ CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- ? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython
- : CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- ? linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython
- : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- ? linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython
- : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- ? linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython
- : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- ? linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython
- : CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython
+ linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython:
+ CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
timeoutInMinutes: 360
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
similarity index 100%
rename from .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
similarity index 100%
rename from .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
similarity index 100%
rename from .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
similarity index 100%
rename from .ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
similarity index 100%
rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
similarity index 100%
rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
similarity index 100%
rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
similarity index 100%
rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml
deleted file mode 100644
index b3b0020e..00000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- cuda-nvcc
-cuda_compiler_version:
-- '12.0'
-cudnn:
-- '8'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 23.5.26
-giflib:
-- '5.2'
-icu:
-- '72'
-libabseil:
-- '20230125'
-libcurl:
-- '8'
-libgrpc:
-- '1.56'
-libjpeg_turbo:
-- 2.1.5
-libpng:
-- '1.6'
-libprotobuf:
-- 4.23.3
-nccl:
-- '2'
-numpy:
-- '1.22'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.10.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-zip_keys:
-- - c_compiler_version
- - cxx_compiler_version
- - cuda_compiler
- - cuda_compiler_version
- - cdt_name
- - docker_image
-- - libgrpc
- - libprotobuf
-- - python
- - numpy
- - python_impl
-zlib:
-- '1.2'
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml
deleted file mode 100644
index ce6e4a64..00000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- cuda-nvcc
-cuda_compiler_version:
-- '12.0'
-cudnn:
-- '8'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 23.5.26
-giflib:
-- '5.2'
-icu:
-- '72'
-libabseil:
-- '20230125'
-libcurl:
-- '8'
-libgrpc:
-- '1.56'
-libjpeg_turbo:
-- 2.1.5
-libpng:
-- '1.6'
-libprotobuf:
-- 4.23.3
-nccl:
-- '2'
-numpy:
-- '1.22'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.8.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-zip_keys:
-- - c_compiler_version
- - cxx_compiler_version
- - cuda_compiler
- - cuda_compiler_version
- - cdt_name
- - docker_image
-- - libgrpc
- - libprotobuf
-- - python
- - numpy
- - python_impl
-zlib:
-- '1.2'
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml
deleted file mode 100644
index 185ae76c..00000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- cuda-nvcc
-cuda_compiler_version:
-- '12.0'
-cudnn:
-- '8'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 23.5.26
-giflib:
-- '5.2'
-icu:
-- '72'
-libabseil:
-- '20230125'
-libcurl:
-- '8'
-libgrpc:
-- '1.56'
-libjpeg_turbo:
-- 2.1.5
-libpng:
-- '1.6'
-libprotobuf:
-- 4.23.3
-nccl:
-- '2'
-numpy:
-- '1.22'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.9.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-zip_keys:
-- - c_compiler_version
- - cxx_compiler_version
- - cuda_compiler
- - cuda_compiler_version
- - cdt_name
- - docker_image
-- - libgrpc
- - libprotobuf
-- - python
- - numpy
- - python_impl
-zlib:
-- '1.2'
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml
deleted file mode 100644
index 51daffe0..00000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-cdt_name:
-- cos7
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- cuda-nvcc
-cuda_compiler_version:
-- '12.0'
-cudnn:
-- '8'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 23.5.26
-giflib:
-- '5.2'
-icu:
-- '72'
-libabseil:
-- '20230125'
-libcurl:
-- '8'
-libgrpc:
-- '1.56'
-libjpeg_turbo:
-- 2.1.5
-libpng:
-- '1.6'
-libprotobuf:
-- 4.23.3
-nccl:
-- '2'
-numpy:
-- '1.23'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.11.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-zip_keys:
-- - c_compiler_version
- - cxx_compiler_version
- - cuda_compiler
- - cuda_compiler_version
- - cdt_name
- - docker_image
-- - libgrpc
- - libprotobuf
-- - python
- - numpy
- - python_impl
-zlib:
-- '1.2'
diff --git a/README.md b/README.md
index 0e84dfb8..b75ecdbe 100644
--- a/README.md
+++ b/README.md
@@ -37,87 +37,59 @@ Current build status
Variant | Status |
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython |
+ linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython |
+ linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython |
+ linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython |
+ linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython |
+ linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython |
+ linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython |
+ linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython |
+ linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython |
-
-
- |
-
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.10.____cpython |
-
-
-
-
- |
-
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.8.____cpython |
-
-
-
-
- |
-
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.22python3.9.____cpython |
-
-
-
-
- |
-
- linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12numpy1.23python3.11.____cpython |
-
-
-
+
|
From 9306f77745cf513d454e5f70bd4f8aee7c72cd59 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Wed, 20 Sep 2023 14:25:47 +0000
Subject: [PATCH 20/28] Update abseil patches
---
recipe/meta.yaml | 6 +-
.../0001-Fix-further-abseil-linkage.patch | 60 -------------------
recipe/patches/0001-loosen-requirements.patch | 6 +-
recipe/patches/0002-fix-genproto.patch | 6 +-
recipe/patches/0003-fix-absl-py.patch | 6 +-
...absl_synchronization-linkage-to-gRPC.patch | 6 +-
...-any_invocable-target-to-absel-bazel.patch | 6 +-
.../0006-Fix-missing-abseil-linkages.patch | 6 +-
...npin-gast-dependency-for-pip_package.patch | 6 +-
...008-Use-basename-instead-of-realpath.patch | 6 +-
...9-Fix-protobuf_python-for-systemlibs.patch | 6 +-
.../patches/0010-Add-absl_log-systemlib.patch | 26 ++++----
...ayout_proto_cc-if-protobuf-linkage-.patch} | 11 ++--
.../0012-Fix-further-abseil-linkage.patch | 41 +++++++++++++
14 files changed, 92 insertions(+), 106 deletions(-)
delete mode 100644 recipe/patches/0001-Fix-further-abseil-linkage.patch
rename recipe/patches/{0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch => 0011-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch} (71%)
create mode 100644 recipe/patches/0012-Fix-further-abseil-linkage.patch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 32a4e3a9..5a1b3cb2 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -14,13 +14,13 @@ source:
- patches/0004-Add-additional-absl_synchronization-linkage-to-gRPC.patch
- patches/0005-Add-missing-any_invocable-target-to-absel-bazel.patch
- patches/0006-Fix-missing-abseil-linkages.patch
- # backport https://github.com/tensorflow/tensorflow/pull/61134
+ ## backport https://github.com/tensorflow/tensorflow/pull/61134
- patches/0007-unpin-gast-dependency-for-pip_package.patch
- patches/0008-Use-basename-instead-of-realpath.patch
- patches/0009-Fix-protobuf_python-for-systemlibs.patch
- patches/0010-Add-absl_log-systemlib.patch
- - patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
- - patches/0001-Fix-further-abseil-linkage.patch
+ - patches/0011-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
+ - patches/0012-Fix-further-abseil-linkage.patch
- url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz
sha256: 4175e9276a1eb8b5e4e876d228e4605871832e7bd8517965d6a47f1481af2c3e
diff --git a/recipe/patches/0001-Fix-further-abseil-linkage.patch b/recipe/patches/0001-Fix-further-abseil-linkage.patch
deleted file mode 100644
index fe5f2433..00000000
--- a/recipe/patches/0001-Fix-further-abseil-linkage.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a48220c76f0288178ff38d534015bf01c39733a8 Mon Sep 17 00:00:00 2001
-From: "Uwe L. Korn"
-Date: Mon, 18 Sep 2023 14:47:08 +0000
-Subject: [PATCH] Fix further abseil linkage
-
----
- third_party/absl/system.absl.base.BUILD | 12 ++++++++++--
- third_party/absl/system.absl.log.BUILD | 3 +++
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD
-index d6bf8748..f6b62c9f 100644
---- a/third_party/absl/system.absl.base.BUILD
-+++ b/third_party/absl/system.absl.base.BUILD
-@@ -17,12 +17,20 @@ package(default_visibility = ["//visibility:public"])
-
- cc_library(
- name = "log_severity",
-- linkopts = ["-labsl_log_severity"],
-+ linkopts = [
-+ "-labsl_log_severity",
-+ "-labsl_log_internal_message",
-+ "-labsl_log_internal_nullguard",
-+ ],
- )
-
- cc_library(
- name = "raw_logging_internal",
-- linkopts = ["-labsl_raw_logging_internal"],
-+ linkopts = [
-+ "-labsl_raw_logging_internal",
-+ "-labsl_log_internal_message",
-+ "-labsl_log_internal_nullguard",
-+ ],
- visibility = [
- "//absl:__subpackages__",
- ],
-diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD
-index 9df9d3ce..89047c7d 100644
---- a/third_party/absl/system.absl.log.BUILD
-+++ b/third_party/absl/system.absl.log.BUILD
-@@ -6,6 +6,8 @@ cc_library(
- name = "log",
- linkopts = [
- "-labsl_log_internal_conditions",
-+ "-labsl_log_internal_message",
-+ "-labsl_log_internal_nullguard",
- ],
- )
-
-@@ -14,5 +16,6 @@ cc_library(
- linkopts = [
- "-labsl_log_internal_check_op",
- "-labsl_log_internal_message",
-+ "-labsl_log_internal_nullguard",
- ],
- )
---
-2.30.2
-
diff --git a/recipe/patches/0001-loosen-requirements.patch b/recipe/patches/0001-loosen-requirements.patch
index 0d3a9daf..52a2046f 100644
--- a/recipe/patches/0001-loosen-requirements.patch
+++ b/recipe/patches/0001-loosen-requirements.patch
@@ -1,7 +1,7 @@
-From 811618fa822f243ea8ee2b9b222d477c3f1d261a Mon Sep 17 00:00:00 2001
+From 436c51c9864934ae399703bcaf05ff732b9ddf6e Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Thu, 30 Dec 2021 06:57:09 +0200
-Subject: [PATCH 01/10] loosen requirements
+Subject: [PATCH 01/12] loosen requirements
* Remove unused libclang requirement
* Remove unecessary tensorflow-io-gcs-filesystem
@@ -37,5 +37,5 @@ index e77e6f81..f7ab72c4 100644
# BoringSSL support.
# See https://github.com/tensorflow/tensorflow/issues/17882.
--
-2.39.2 (Apple Git-143)
+2.30.2
diff --git a/recipe/patches/0002-fix-genproto.patch b/recipe/patches/0002-fix-genproto.patch
index 4eb1f60b..8937ff09 100644
--- a/recipe/patches/0002-fix-genproto.patch
+++ b/recipe/patches/0002-fix-genproto.patch
@@ -1,7 +1,7 @@
-From a53a2e9c8b54dc28cc2de98af061e9ab682176be Mon Sep 17 00:00:00 2001
+From 0fa0515e3ead93083f2474352acb520feb5f77f1 Mon Sep 17 00:00:00 2001
From: ngam <67342040+ngam@users.noreply.github.com>
Date: Thu, 18 May 2023 23:36:59 -0400
-Subject: [PATCH 02/10] fix genproto
+Subject: [PATCH 02/12] fix genproto
---
tensorflow/tsl/platform/default/build_config.bzl | 5 +----
@@ -24,5 +24,5 @@ index 6ffd37bf..cafa2013 100644
proto_gen(
name = name + "_genproto",
--
-2.39.2 (Apple Git-143)
+2.30.2
diff --git a/recipe/patches/0003-fix-absl-py.patch b/recipe/patches/0003-fix-absl-py.patch
index 62609e0c..c09e8f4f 100644
--- a/recipe/patches/0003-fix-absl-py.patch
+++ b/recipe/patches/0003-fix-absl-py.patch
@@ -1,7 +1,7 @@
-From 2d13bc9c78fbe4ffda1888ff4d234c216d452052 Mon Sep 17 00:00:00 2001
+From 322ea9a3bf6acbb058130bcb8053eeea5e6d7b6e Mon Sep 17 00:00:00 2001
From: Jinzhe Zeng
Date: Thu, 18 May 2023 06:30:06 -0400
-Subject: [PATCH 03/10] fix absl-py
+Subject: [PATCH 03/12] fix absl-py
---
third_party/systemlibs/absl_py.absl.flags.BUILD | 4 ++++
@@ -20,5 +20,5 @@ index 4049989a..d92f4949 100644
+ name = "argparse_flags",
+)
--
-2.39.2 (Apple Git-143)
+2.30.2
diff --git a/recipe/patches/0004-Add-additional-absl_synchronization-linkage-to-gRPC.patch b/recipe/patches/0004-Add-additional-absl_synchronization-linkage-to-gRPC.patch
index 24e84411..0a74365f 100644
--- a/recipe/patches/0004-Add-additional-absl_synchronization-linkage-to-gRPC.patch
+++ b/recipe/patches/0004-Add-additional-absl_synchronization-linkage-to-gRPC.patch
@@ -1,7 +1,7 @@
-From 56d092b5f49e7773234b624c58afef9317235e9b Mon Sep 17 00:00:00 2001
+From 34a97c64c5314671451d046885d70634ef62b3ee Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Fri, 30 Jun 2023 08:39:32 +0000
-Subject: [PATCH 04/10] Add additional absl_synchronization linkage to gRPC
+Subject: [PATCH 04/12] Add additional absl_synchronization linkage to gRPC
---
third_party/systemlibs/grpc.BUILD | 3 +++
@@ -36,5 +36,5 @@ index 8b703f11..417baf5d 100644
visibility = ["//visibility:public"],
)
--
-2.39.2 (Apple Git-143)
+2.30.2
diff --git a/recipe/patches/0005-Add-missing-any_invocable-target-to-absel-bazel.patch b/recipe/patches/0005-Add-missing-any_invocable-target-to-absel-bazel.patch
index 9de2037b..2a1518fe 100644
--- a/recipe/patches/0005-Add-missing-any_invocable-target-to-absel-bazel.patch
+++ b/recipe/patches/0005-Add-missing-any_invocable-target-to-absel-bazel.patch
@@ -1,7 +1,7 @@
-recipe/patches/0005-Add-missing-any_invocable-target-to-absel-bazel.patchFrom 7a73e8691bd7f6c66eb887520576482e9cee9f87 Mon Sep 17 00:00:00 2001
+From a80060b0bc108c010246026c33a957d155f5d2cf Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Sun, 2 Jul 2023 05:36:41 +0000
-Subject: [PATCH 05/10] Add missing any_invocable target to absel bazel
+Subject: [PATCH 05/12] Add missing any_invocable target to absel bazel
---
third_party/absl/system.absl.functional.BUILD | 4 ++++
@@ -20,5 +20,5 @@ index a4f70acf..f05aa98d 100644
+ name = "any_invocable",
+)
--
-2.39.2 (Apple Git-143)
+2.30.2
diff --git a/recipe/patches/0006-Fix-missing-abseil-linkages.patch b/recipe/patches/0006-Fix-missing-abseil-linkages.patch
index 40390417..3962584f 100644
--- a/recipe/patches/0006-Fix-missing-abseil-linkages.patch
+++ b/recipe/patches/0006-Fix-missing-abseil-linkages.patch
@@ -1,7 +1,7 @@
-From 55d357204d4f3b44eb5da91eb587b46785f57178 Mon Sep 17 00:00:00 2001
+From 146ee97bd239e5854773599f29d8b4b0d6294e91 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Mon, 3 Jul 2023 04:45:46 +0000
-Subject: [PATCH 06/10] Fix missing abseil linkages
+Subject: [PATCH 06/12] Fix missing abseil linkages
---
third_party/absl/system.absl.strings.BUILD | 2 +-
@@ -21,5 +21,5 @@ index fa9a7a84..d04776c9 100644
":str_format",
"//absl/container:compressed_tuple",
--
-2.39.2 (Apple Git-143)
+2.30.2
diff --git a/recipe/patches/0007-unpin-gast-dependency-for-pip_package.patch b/recipe/patches/0007-unpin-gast-dependency-for-pip_package.patch
index e1040ede..fd5d47bb 100644
--- a/recipe/patches/0007-unpin-gast-dependency-for-pip_package.patch
+++ b/recipe/patches/0007-unpin-gast-dependency-for-pip_package.patch
@@ -1,7 +1,7 @@
-From aaaf3251925bc4eac5f3fe7c5d02da220038761c Mon Sep 17 00:00:00 2001
+From d739b2b28deea98ece3c192e8a33e9013a1dc3bd Mon Sep 17 00:00:00 2001
From: "H. Vetinari"
Date: Sat, 1 Jul 2023 10:25:10 +1100
-Subject: [PATCH 07/10] unpin gast dependency for pip_package
+Subject: [PATCH 07/12] unpin gast dependency for pip_package
Commit c762c4501ca017994c1fa5554c3c8e47b7c80b66 noted that
"I also know that gast 0.5.2 breaks one of our tests" and committed
@@ -30,5 +30,5 @@ index f7ab72c4..87acb041 100644
'h5py >= 2.9.0',
'numpy >= 1.22',
--
-2.39.2 (Apple Git-143)
+2.30.2
diff --git a/recipe/patches/0008-Use-basename-instead-of-realpath.patch b/recipe/patches/0008-Use-basename-instead-of-realpath.patch
index 06a65d73..9c8ad573 100644
--- a/recipe/patches/0008-Use-basename-instead-of-realpath.patch
+++ b/recipe/patches/0008-Use-basename-instead-of-realpath.patch
@@ -1,7 +1,7 @@
-From 4255effd0c3653211643e240bd90f50db2bd115b Mon Sep 17 00:00:00 2001
+From a0efca1c4b063131549988f267abc8b7fa9160ef Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Wed, 30 Aug 2023 16:57:31 +0200
-Subject: [PATCH 08/10] Use basename instead of realpath
+Subject: [PATCH 08/12] Use basename instead of realpath
---
tensorflow/tensorflow.bzl | 2 +-
@@ -21,5 +21,5 @@ index e9f5e5aa..26573640 100644
)
--
-2.39.2 (Apple Git-143)
+2.30.2
diff --git a/recipe/patches/0009-Fix-protobuf_python-for-systemlibs.patch b/recipe/patches/0009-Fix-protobuf_python-for-systemlibs.patch
index d9211d79..73981487 100644
--- a/recipe/patches/0009-Fix-protobuf_python-for-systemlibs.patch
+++ b/recipe/patches/0009-Fix-protobuf_python-for-systemlibs.patch
@@ -1,7 +1,7 @@
-From 4f95e7a262af1c50e0632e74a67314b1fb500147 Mon Sep 17 00:00:00 2001
+From 6bf07b788ecb0e7e2b20c248418195681a167f51 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Wed, 30 Aug 2023 16:58:41 +0200
-Subject: [PATCH 09/10] Fix protobuf_python for systemlibs
+Subject: [PATCH 09/12] Fix protobuf_python for systemlibs
---
tensorflow/workspace2.bzl | 9 ++++---
@@ -82,5 +82,5 @@ index 00000000..982617a7
+ visibility = ["//visibility:public"],
+)
--
-2.39.2 (Apple Git-143)
+2.30.2
diff --git a/recipe/patches/0010-Add-absl_log-systemlib.patch b/recipe/patches/0010-Add-absl_log-systemlib.patch
index 9b651081..fb095cc8 100644
--- a/recipe/patches/0010-Add-absl_log-systemlib.patch
+++ b/recipe/patches/0010-Add-absl_log-systemlib.patch
@@ -1,20 +1,20 @@
-recipe/patches/0010-Add-absl_log-systemlib.patchFrom 2fa70c7ff080882595d2e3dabacb607364dba9c4 Mon Sep 17 00:00:00 2001
+From 66417efd8ef37684bcb836860973a91f2238b28e Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Wed, 30 Aug 2023 16:59:28 +0200
-Subject: [PATCH 10/10] Add absl_log systemlib
+Subject: [PATCH 10/12] Add absl_log systemlib
---
- third_party/absl/system.absl.log.BUILD | 18 ++++++++++++++++++
+ third_party/absl/system.absl.log.BUILD | 22 ++++++++++++++++++++++
third_party/absl/workspace.bzl | 1 +
- 2 files changed, 19 insertions(+)
+ 2 files changed, 23 insertions(+)
create mode 100644 third_party/absl/system.absl.log.BUILD
diff --git a/third_party/absl/system.absl.log.BUILD b/third_party/absl/system.absl.log.BUILD
new file mode 100644
-index 00000000..9df9d3ce
+index 00000000..0248bda0
--- /dev/null
+++ b/third_party/absl/system.absl.log.BUILD
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,22 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
+package(default_visibility = ["//visibility:public"])
@@ -22,7 +22,10 @@ index 00000000..9df9d3ce
+cc_library(
+ name = "log",
+ linkopts = [
-+ "-labsl_log_internal_conditions",
++ "-labsl_log_internal_conditions",
++ "-labsl_log_internal_check_op",
++ "-labsl_log_internal_message",
++ "-labsl_log_internal_nullguard",
+ ],
+)
+
@@ -30,21 +33,22 @@ index 00000000..9df9d3ce
+ name = "check",
+ linkopts = [
+ "-labsl_log_internal_check_op",
-+ "-labsl_log_internal_message",
++ "-labsl_log_internal_message",
++ "-labsl_log_internal_nullguard",
+ ],
+)
diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl
-index 07f49ceb..19cc4dd4 100644
+index 07f49ceb..a7f4e5ff 100644
--- a/third_party/absl/workspace.bzl
+++ b/third_party/absl/workspace.bzl
@@ -20,6 +20,7 @@ def repo():
"flags",
"functional",
"hash",
-+ "log",
++ "log",
"memory",
"meta",
"numeric",
--
-2.39.2 (Apple Git-143)
+2.30.2
diff --git a/recipe/patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch b/recipe/patches/0011-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
similarity index 71%
rename from recipe/patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
rename to recipe/patches/0011-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
index 1e31c1e45..207d0ece 100644
--- a/recipe/patches/0001-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
+++ b/recipe/patches/0011-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
@@ -1,17 +1,18 @@
-From 246cf18d89a14752cb0a5589ea74b6759f4ca142 Mon Sep 17 00:00:00 2001
+From 4d9b577c6b26805d556603da919049cada394cd2 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Fri, 15 Sep 2023 11:06:27 +0200
-Subject: [PATCH] Omit linking to layout_proto_cc if protobuf linkage is shared
+Subject: [PATCH 11/12] Omit linking to layout_proto_cc if protobuf linkage is
+ shared
---
tensorflow/python/BUILD | 1 -
1 file changed, 1 deletion(-)
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
-index e71da3f9..af5ddda3 100644
+index 6c8d5b55..73f58ed7 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
-@@ -4407,7 +4407,6 @@ tf_python_pybind_extension(
+@@ -5043,7 +5043,6 @@ tf_python_pybind_extension(
features = ["-layering_check"],
deps = [
":pywrap_densor_device_headers",
@@ -20,5 +21,5 @@ index e71da3f9..af5ddda3 100644
"//tensorflow/python/lib/core:pybind11_status_headers",
"//third_party/python_runtime:headers", # buildcleaner: keep
--
-2.39.2 (Apple Git-143)
+2.30.2
diff --git a/recipe/patches/0012-Fix-further-abseil-linkage.patch b/recipe/patches/0012-Fix-further-abseil-linkage.patch
new file mode 100644
index 00000000..3dcf60a1
--- /dev/null
+++ b/recipe/patches/0012-Fix-further-abseil-linkage.patch
@@ -0,0 +1,41 @@
+From 8b33dc7715cfde4af71f22f85bdc969130de3c33 Mon Sep 17 00:00:00 2001
+From: "Uwe L. Korn"
+Date: Mon, 18 Sep 2023 14:47:08 +0000
+Subject: [PATCH 12/12] Fix further abseil linkage
+
+---
+ third_party/absl/system.absl.base.BUILD | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/absl/system.absl.base.BUILD b/third_party/absl/system.absl.base.BUILD
+index d6bf8748..b3e42f4d 100644
+--- a/third_party/absl/system.absl.base.BUILD
++++ b/third_party/absl/system.absl.base.BUILD
+@@ -17,12 +17,22 @@ package(default_visibility = ["//visibility:public"])
+
+ cc_library(
+ name = "log_severity",
+- linkopts = ["-labsl_log_severity"],
++ linkopts = [
++ "-labsl_log_severity",
++ "-labsl_log_internal_check_op",
++ "-labsl_log_internal_message",
++ "-labsl_log_internal_nullguard",
++ ],
+ )
+
+ cc_library(
+ name = "raw_logging_internal",
+- linkopts = ["-labsl_raw_logging_internal"],
++ linkopts = [
++ "-labsl_raw_logging_internal",
++ "-labsl_log_internal_check_op",
++ "-labsl_log_internal_message",
++ "-labsl_log_internal_nullguard",
++ ],
+ visibility = [
+ "//absl:__subpackages__",
+ ],
+--
+2.30.2
+
From 5772d4fb0631010935d7334c80f7e18a6beeb7fe Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Mon, 25 Sep 2023 13:55:49 +0000
Subject: [PATCH 21/28] MNT: Re-rendered with conda-build 3.25.0, conda-smithy
3.26.2, and conda-forge-pinning 2023.09.25.12.55.07
---
.../migrations/jpeg_to_libjpeg_turbo.yaml | 15 --------
.ci_support/migrations/python311.yaml | 37 -------------------
.scripts/build_steps.sh | 9 ++---
.scripts/logging_utils.sh | 4 +-
.scripts/run_osx_build.sh | 8 ++--
5 files changed, 10 insertions(+), 63 deletions(-)
delete mode 100644 .ci_support/migrations/jpeg_to_libjpeg_turbo.yaml
delete mode 100644 .ci_support/migrations/python311.yaml
diff --git a/.ci_support/migrations/jpeg_to_libjpeg_turbo.yaml b/.ci_support/migrations/jpeg_to_libjpeg_turbo.yaml
deleted file mode 100644
index dad138a3..00000000
--- a/.ci_support/migrations/jpeg_to_libjpeg_turbo.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-migrator_ts: 1678152141
-__migrator:
- kind: version
- migration_number: 3
- bump_number: 1
- commit_message: "Rebuild for jpegturbo migration"
- paused: false
- pr_limit: 10
-
-libjpeg_turbo:
- - 2.1.5
-# This migration is matched with a minimigrator that will
-# replace jpeg with libjpegturbo
-jpeg:
- - 10
diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml
deleted file mode 100644
index c00be95a..00000000
--- a/.ci_support/migrations/python311.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-migrator_ts: 1666686085
-__migrator:
- migration_number: 1
- operation: key_add
- primary_key: python
- ordering:
- python:
- - 3.6.* *_cpython
- - 3.7.* *_cpython
- - 3.8.* *_cpython
- - 3.9.* *_cpython
- - 3.10.* *_cpython
- - 3.11.* *_cpython # new entry
- - 3.6.* *_73_pypy
- - 3.7.* *_73_pypy
- - 3.8.* *_73_pypy
- - 3.9.* *_73_pypy
- paused: false
- longterm: True
- pr_limit: 60
- max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times
- exclude:
- # this shouldn't attempt to modify the python feedstocks
- - python
- - pypy3.6
- - pypy-meta
- - cross-python
- - python_abi
- exclude_pinned_pkgs: false
-
-python:
- - 3.11.* *_cpython
-# additional entries to add for zip_keys
-numpy:
- - 1.23
-python_impl:
- - cpython
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index a6b09f6b..322832b9 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -31,11 +31,10 @@ pkgs_dirs:
CONDARC
-
-mamba install --update-specs --yes --quiet --channel conda-forge \
- conda-build pip boa conda-forge-ci-setup=3
-mamba update --update-specs --yes --quiet --channel conda-forge \
- conda-build pip boa conda-forge-ci-setup=3
+mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
+ pip mamba conda-build boa conda-forge-ci-setup=3
+mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
+ pip mamba conda-build boa conda-forge-ci-setup
# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
index 57bc95c2..aff009f0 100644
--- a/.scripts/logging_utils.sh
+++ b/.scripts/logging_utils.sh
@@ -12,7 +12,7 @@ function startgroup {
echo "##[group]$1";;
travis )
echo "$1"
- echo -en 'travis_fold:start:'"${1// /}"'\\r';;
+ echo -en 'travis_fold:start:'"${1// /}"'\r';;
github_actions )
echo "::group::$1";;
* )
@@ -28,7 +28,7 @@ function endgroup {
azure )
echo "##[endgroup]";;
travis )
- echo -en 'travis_fold:end:'"${1// /}"'\\r';;
+ echo -en 'travis_fold:end:'"${1// /}"'\r';;
github_actions )
echo "::endgroup::";;
esac
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index 3969edf3..cd9a88f2 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -23,10 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME}
source ${MINIFORGE_HOME}/etc/profile.d/conda.sh
conda activate base
-mamba install --update-specs --quiet --yes --channel conda-forge \
- conda-build pip boa conda-forge-ci-setup=3
-mamba update --update-specs --yes --quiet --channel conda-forge \
- conda-build pip boa conda-forge-ci-setup=3
+mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
+ pip mamba conda-build boa conda-forge-ci-setup=3
+mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
+ pip mamba conda-build boa conda-forge-ci-setup
From 307badf30572e8dbfeb3a61d043c845b7b2d21aa Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Wed, 27 Sep 2023 20:37:38 +0200
Subject: [PATCH 22/28] Bump to 2.13.1
---
recipe/meta.yaml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 5a1b3cb2..1cc03712 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,4 +1,5 @@
-{% set version = "2.13.0" %}
+{% set version = "2.13.1" %}
+{% set estimator_version = "2.13.0" %}
package:
name: tensorflow-split
@@ -6,7 +7,7 @@ package:
source:
- url: https://github.com/tensorflow/tensorflow/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz
- sha256: e58c939079588623e6fa1d054aec2f90f95018266e0a970fd353a5244f5173dc
+ sha256: 89c07aebd4f41fbe0d08cc88aef00305542134f2f16d3b62918dc3c1182f33e2
patches:
- patches/0001-loosen-requirements.patch
- patches/0002-fix-genproto.patch
@@ -22,7 +23,7 @@ source:
- patches/0011-Omit-linking-to-layout_proto_cc-if-protobuf-linkage-.patch
- patches/0012-Fix-further-abseil-linkage.patch
- - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ version.replace(".rc", "-rc") }}.tar.gz
+ - url: https://github.com/tensorflow/estimator/archive/refs/tags/v{{ estimator_version.replace(".rc", "-rc") }}.tar.gz
sha256: 4175e9276a1eb8b5e4e876d228e4605871832e7bd8517965d6a47f1481af2c3e
folder: tensorflow-estimator
From aecdc66a1b7d11ccbcbedbbe55edd995398c3226 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Fri, 13 Oct 2023 08:07:14 +0000
Subject: [PATCH 23/28] MNT: Re-rendered with conda-build 3.25.0, conda-smithy
3.27.1, and conda-forge-pinning 2023.10.13.01.23.53
---
.azure-pipelines/azure-pipelines-linux.yml | 49 ++++--------
...sion10numpy1.22python3.10.____cpython.yaml | 6 +-
...rsion10numpy1.22python3.8.____cpython.yaml | 6 +-
...rsion10numpy1.22python3.9.____cpython.yaml | 6 +-
...sion10numpy1.23python3.11.____cpython.yaml | 6 +-
...ion11numpy1.22python3.10.____cpython.yaml} | 14 ++--
...sion11numpy1.22python3.8.____cpython.yaml} | 14 ++--
...sion11numpy1.22python3.9.____cpython.yaml} | 14 ++--
...ion11numpy1.23python3.11.____cpython.yaml} | 14 ++--
...sion12numpy1.22python3.10.____cpython.yaml | 6 +-
...rsion12numpy1.22python3.8.____cpython.yaml | 6 +-
...rsion12numpy1.22python3.9.____cpython.yaml | 6 +-
...sion12numpy1.23python3.11.____cpython.yaml | 6 +-
...sion12numpy1.22python3.10.____cpython.yaml | 76 -------------------
...rsion12numpy1.22python3.8.____cpython.yaml | 76 -------------------
...rsion12numpy1.22python3.9.____cpython.yaml | 76 -------------------
...sion12numpy1.23python3.11.____cpython.yaml | 76 -------------------
...sx_64_numpy1.22python3.10.____cpython.yaml | 10 +--
...osx_64_numpy1.22python3.8.____cpython.yaml | 10 +--
...osx_64_numpy1.22python3.9.____cpython.yaml | 10 +--
...sx_64_numpy1.23python3.11.____cpython.yaml | 10 +--
...arm64_numpy1.22python3.10.____cpython.yaml | 10 +--
..._arm64_numpy1.22python3.8.____cpython.yaml | 10 +--
..._arm64_numpy1.22python3.9.____cpython.yaml | 10 +--
...arm64_numpy1.23python3.11.____cpython.yaml | 10 +--
.scripts/build_steps.sh | 4 -
.scripts/run_osx_build.sh | 4 -
README.md | 60 ++++-----------
28 files changed, 124 insertions(+), 481 deletions(-)
rename .ci_support/{linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml} (89%)
rename .ci_support/{linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml} (89%)
rename .ci_support/{linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml} (89%)
rename .ci_support/{linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml} (89%)
delete mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
delete mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
delete mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
delete mode 100644 .ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
index aee9cd39..d84e726a 100755
--- a/.azure-pipelines/azure-pipelines-linux.yml
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -8,38 +8,6 @@ jobs:
vmImage: ubuntu-latest
strategy:
matrix:
-<<<<<<< HEAD
- linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython:
- CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2
- linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython:
- CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2
- linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython:
- CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2
- linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython:
- CONFIG: linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2
- linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython:
- CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython:
- CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython:
- CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
- linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython:
- CONFIG: linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython
-=======
? linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython
: CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython
UPLOAD_PACKAGES: 'True'
@@ -56,6 +24,22 @@ jobs:
: CONFIG: linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2
+ ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython
+ : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython
+ UPLOAD_PACKAGES: 'True'
+ DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8
+ ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython
+ : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython
+ UPLOAD_PACKAGES: 'True'
+ DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8
+ ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython
+ : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython
+ UPLOAD_PACKAGES: 'True'
+ DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8
+ ? linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython
+ : CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython
+ UPLOAD_PACKAGES: 'True'
+ DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8
? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython
: CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython
UPLOAD_PACKAGES: 'True'
@@ -70,7 +54,6 @@ jobs:
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
? linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython
: CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython
->>>>>>> main
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
timeoutInMinutes: 1
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
index 0a2af511..0c7adfdb 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
index 3c0b7e8b..65d63177 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
index 2690843d..0a1ac6c7 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
index a153e46b..a538973b 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml
similarity index 89%
rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml
index 0a2af511..e21cc2ca 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
-- '10'
+- '11'
cdt_name:
- cos7
channel_sources:
@@ -11,15 +11,15 @@ channel_targets:
cuda_compiler:
- nvcc
cuda_compiler_version:
-- '11.2'
+- '11.8'
cudnn:
- '8'
cxx_compiler:
- gxx
cxx_compiler_version:
-- '10'
+- '11'
docker_image:
-- quay.io/condaforge/linux-anvil-cuda:11.2
+- quay.io/condaforge/linux-anvil-cuda:11.8
flatbuffers:
- 23.5.26
giflib:
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml
similarity index 89%
rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml
index 3c0b7e8b..ea434b14 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
-- '10'
+- '11'
cdt_name:
- cos7
channel_sources:
@@ -11,15 +11,15 @@ channel_targets:
cuda_compiler:
- nvcc
cuda_compiler_version:
-- '11.2'
+- '11.8'
cudnn:
- '8'
cxx_compiler:
- gxx
cxx_compiler_version:
-- '10'
+- '11'
docker_image:
-- quay.io/condaforge/linux-anvil-cuda:11.2
+- quay.io/condaforge/linux-anvil-cuda:11.8
flatbuffers:
- 23.5.26
giflib:
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml
similarity index 89%
rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml
index 2690843d..78007f84 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
-- '10'
+- '11'
cdt_name:
- cos7
channel_sources:
@@ -11,15 +11,15 @@ channel_targets:
cuda_compiler:
- nvcc
cuda_compiler_version:
-- '11.2'
+- '11.8'
cudnn:
- '8'
cxx_compiler:
- gxx
cxx_compiler_version:
-- '10'
+- '11'
docker_image:
-- quay.io/condaforge/linux-anvil-cuda:11.2
+- quay.io/condaforge/linux-anvil-cuda:11.8
flatbuffers:
- 23.5.26
giflib:
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml
similarity index 89%
rename from .ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml
index a153e46b..10b80aff 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
-- '10'
+- '11'
cdt_name:
- cos7
channel_sources:
@@ -11,15 +11,15 @@ channel_targets:
cuda_compiler:
- nvcc
cuda_compiler_version:
-- '11.2'
+- '11.8'
cudnn:
- '8'
cxx_compiler:
- gxx
cxx_compiler_version:
-- '10'
+- '11'
docker_image:
-- quay.io/condaforge/linux-anvil-cuda:11.2
+- quay.io/condaforge/linux-anvil-cuda:11.8
flatbuffers:
- 23.5.26
giflib:
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
index 83b3e891..5325e41d 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
index 5e4792d6..6e588914 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
index f2fc9bf8..58afcc59 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
index cbb0b0b1..1a72109b 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
@@ -27,17 +27,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
nccl:
- '2'
numpy:
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
deleted file mode 100644
index 83b3e891..00000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-cdt_name:
-- cos6
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- None
-cuda_compiler_version:
-- None
-cudnn:
-- '8'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 23.5.26
-giflib:
-- '5.2'
-icu:
-- '73'
-libabseil:
-- '20230125'
-libcurl:
-- '8'
-libgrpc:
-- '1.56'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 4.23.3
-nccl:
-- '2'
-numpy:
-- '1.22'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.10.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-zip_keys:
-- - c_compiler_version
- - cxx_compiler_version
- - cuda_compiler
- - cuda_compiler_version
- - cdt_name
- - docker_image
-- - libgrpc
- - libprotobuf
-- - python
- - numpy
- - python_impl
-zlib:
-- '1.2'
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
deleted file mode 100644
index 5e4792d6..00000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-cdt_name:
-- cos6
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- None
-cuda_compiler_version:
-- None
-cudnn:
-- '8'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 23.5.26
-giflib:
-- '5.2'
-icu:
-- '73'
-libabseil:
-- '20230125'
-libcurl:
-- '8'
-libgrpc:
-- '1.56'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 4.23.3
-nccl:
-- '2'
-numpy:
-- '1.22'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.8.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-zip_keys:
-- - c_compiler_version
- - cxx_compiler_version
- - cuda_compiler
- - cuda_compiler_version
- - cdt_name
- - docker_image
-- - libgrpc
- - libprotobuf
-- - python
- - numpy
- - python_impl
-zlib:
-- '1.2'
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
deleted file mode 100644
index f2fc9bf8..00000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-cdt_name:
-- cos6
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- None
-cuda_compiler_version:
-- None
-cudnn:
-- '8'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 23.5.26
-giflib:
-- '5.2'
-icu:
-- '73'
-libabseil:
-- '20230125'
-libcurl:
-- '8'
-libgrpc:
-- '1.56'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 4.23.3
-nccl:
-- '2'
-numpy:
-- '1.22'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.9.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-zip_keys:
-- - c_compiler_version
- - cxx_compiler_version
- - cuda_compiler
- - cuda_compiler_version
- - cdt_name
- - docker_image
-- - libgrpc
- - libprotobuf
-- - python
- - numpy
- - python_impl
-zlib:
-- '1.2'
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
deleted file mode 100644
index cbb0b0b1..00000000
--- a/.ci_support/linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-c_compiler:
-- gcc
-c_compiler_version:
-- '12'
-cdt_name:
-- cos6
-channel_sources:
-- conda-forge
-channel_targets:
-- conda-forge main
-cuda_compiler:
-- None
-cuda_compiler_version:
-- None
-cudnn:
-- '8'
-cxx_compiler:
-- gxx
-cxx_compiler_version:
-- '12'
-docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
-flatbuffers:
-- 23.5.26
-giflib:
-- '5.2'
-icu:
-- '73'
-libabseil:
-- '20230125'
-libcurl:
-- '8'
-libgrpc:
-- '1.56'
-libjpeg_turbo:
-- '3'
-libpng:
-- '1.6'
-libprotobuf:
-- 4.23.3
-nccl:
-- '2'
-numpy:
-- '1.23'
-openssl:
-- '3'
-perl:
-- 5.32.1
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.11.* *_cpython
-python_impl:
-- cpython
-snappy:
-- '1'
-sqlite:
-- '3'
-target_platform:
-- linux-64
-zip_keys:
-- - c_compiler_version
- - cxx_compiler_version
- - cuda_compiler
- - cuda_compiler_version
- - cdt_name
- - docker_image
-- - libgrpc
- - libprotobuf
-- - python
- - numpy
- - python_impl
-zlib:
-- '1.2'
diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
index c6d4b21c..810e1fb8 100644
--- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '16'
channel_sources:
- conda-forge
channel_targets:
@@ -15,7 +15,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '16'
flatbuffers:
- 23.5.26
giflib:
@@ -23,17 +23,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
index a057c2d5..f1014127 100644
--- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '16'
channel_sources:
- conda-forge
channel_targets:
@@ -15,7 +15,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '16'
flatbuffers:
- 23.5.26
giflib:
@@ -23,17 +23,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
index a0fe594c..861c2ab8 100644
--- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '16'
channel_sources:
- conda-forge
channel_targets:
@@ -15,7 +15,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '16'
flatbuffers:
- 23.5.26
giflib:
@@ -23,17 +23,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
index c5287e33..45d03a3a 100644
--- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '16'
channel_sources:
- conda-forge
channel_targets:
@@ -15,7 +15,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '16'
flatbuffers:
- 23.5.26
giflib:
@@ -23,17 +23,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
index dfbcf0a1..cfc06a30 100644
--- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
@@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '16'
channel_sources:
- conda-forge
channel_targets:
@@ -13,7 +13,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '16'
flatbuffers:
- 23.5.26
giflib:
@@ -21,17 +21,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
index a20d5de7..96fbcc56 100644
--- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
@@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '16'
channel_sources:
- conda-forge
channel_targets:
@@ -13,7 +13,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '16'
flatbuffers:
- 23.5.26
giflib:
@@ -21,17 +21,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
index 6281af81..5939b790 100644
--- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
@@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '16'
channel_sources:
- conda-forge
channel_targets:
@@ -13,7 +13,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '16'
flatbuffers:
- 23.5.26
giflib:
@@ -21,17 +21,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
index b7fcff64..71a0f5dd 100644
--- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
@@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
-- '15'
+- '16'
channel_sources:
- conda-forge
channel_targets:
@@ -13,7 +13,7 @@ cuda_compiler_version:
cxx_compiler:
- clangxx
cxx_compiler_version:
-- '15'
+- '16'
flatbuffers:
- 23.5.26
giflib:
@@ -21,17 +21,17 @@ giflib:
icu:
- '73'
libabseil:
-- '20230125'
+- '20230802'
libcurl:
- '8'
libgrpc:
-- '1.56'
+- '1.54'
libjpeg_turbo:
- '3'
libpng:
- '1.6'
libprotobuf:
-- 4.23.3
+- '3.21'
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index d3e756f5..bd9e6710 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -34,11 +34,7 @@ CONDARC
mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
pip mamba conda-build boa conda-forge-ci-setup=3
mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-<<<<<<< HEAD
- pip mamba conda-build boa conda-forge-ci-setup
-=======
pip mamba conda-build boa conda-forge-ci-setup=3
->>>>>>> main
# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index a61675c4..870c49aa 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -26,11 +26,7 @@ conda activate base
mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
pip mamba conda-build boa conda-forge-ci-setup=3
mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-<<<<<<< HEAD
- pip mamba conda-build boa conda-forge-ci-setup
-=======
pip mamba conda-build boa conda-forge-ci-setup=3
->>>>>>> main
diff --git a/README.md b/README.md
index ea94d969..a4230a7f 100644
--- a/README.md
+++ b/README.md
@@ -37,86 +37,59 @@ Current build status
Variant | Status |
-<<<<<<< HEAD
- linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython |
-
-
-
-
- |
-
- linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython |
-
-
-
-
- |
-
- linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython |
-
-
-
-
- |
-
- linux_64_c_compiler_version10cuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython |
+ linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython |
+ linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython |
+ linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython |
+ linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython |
-
+
|
- linux_64_c_compiler_version12cuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython |
-
-
-
-=======
- | linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython |
+ linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython |
+ linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython |
+ linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython |
-
+
|
- linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython |
+ linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython |
-
+
|
@@ -145,7 +118,6 @@ Current build status
->>>>>>> main
|
From cb26a86f1229b3bce3a3af48545ba57a7687a80e Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Fri, 13 Oct 2023 08:08:30 +0000
Subject: [PATCH 24/28] Pin abseil
---
recipe/conda_build_config.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 0ff63ba2..0628e008 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -10,6 +10,7 @@ MACOSX_SDK_VERSION: # [osx and x86_64]
# https://github.com/conda-forge/tensorflow-feedstock/pull/337
libprotobuf:
- '3.21'
-
+libabseil:
+- '20230125'
libgrpc:
- '1.54'
From a897d52010b927d02f7b9fc5c678e0e3726cc770 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Fri, 13 Oct 2023 08:27:11 +0000
Subject: [PATCH 25/28] MNT: Re-rendered with conda-build 3.25.0, conda-smithy
3.27.1, and conda-forge-pinning 2023.10.13.01.23.53
---
....2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml | 2 +-
...1.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml | 2 +-
...1.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml | 2 +-
....2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml | 2 +-
....8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml | 2 +-
...1.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml | 2 +-
...1.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml | 2 +-
....8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml | 2 +-
...necxx_compiler_version12numpy1.22python3.10.____cpython.yaml | 2 +-
...onecxx_compiler_version12numpy1.22python3.8.____cpython.yaml | 2 +-
...onecxx_compiler_version12numpy1.22python3.9.____cpython.yaml | 2 +-
...necxx_compiler_version12numpy1.23python3.11.____cpython.yaml | 2 +-
.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml | 2 +-
.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml | 2 +-
.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 2 +-
.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml | 2 +-
.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml | 2 +-
.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml | 2 +-
.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 2 +-
.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
index 0c7adfdb..131fa62a 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.10.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
index 65d63177..85986cb4 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.8.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
index 0a1ac6c7..37500c5d 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.22python3.9.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
index a538973b..19a745b3 100644
--- a/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10numpy1.23python3.11.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml
index e21cc2ca..8d2f9bec 100644
--- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.10.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml
index ea434b14..1dc90124 100644
--- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.8.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml
index 78007f84..7f1591b7 100644
--- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.22python3.9.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml
index 10b80aff..ca2b18a7 100644
--- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11numpy1.23python3.11.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
index 5325e41d..30eafbbe 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.10.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
index 6e588914..5a1b4e39 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.8.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
index 58afcc59..5d784b5e 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.22python3.9.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
index 1a72109b..41c0f139 100644
--- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy1.23python3.11.____cpython.yaml
@@ -27,7 +27,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
index 810e1fb8..8e379261 100644
--- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml
@@ -23,7 +23,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
index f1014127..c97399cd 100644
--- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
@@ -23,7 +23,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
index 861c2ab8..0b4b602a 100644
--- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
@@ -23,7 +23,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
index 45d03a3a..dc30e5cb 100644
--- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
@@ -23,7 +23,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
index cfc06a30..e6a1933a 100644
--- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
+++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
@@ -21,7 +21,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
index 96fbcc56..c861b679 100644
--- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
+++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
@@ -21,7 +21,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
index 5939b790..728bb5e3 100644
--- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
+++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
@@ -21,7 +21,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
index 71a0f5dd..d60da110 100644
--- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
+++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
@@ -21,7 +21,7 @@ giflib:
icu:
- '73'
libabseil:
-- '20230802'
+- '20230125'
libcurl:
- '8'
libgrpc:
From 2825cb3d6bc8e53284c769f777964d2c225c4487 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Sat, 14 Oct 2023 15:28:06 +0000
Subject: [PATCH 26/28] Add CUDA 11.8
---
recipe/build.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/recipe/build.sh b/recipe/build.sh
index a6b5a84b..57fef616 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -148,6 +148,8 @@ if [[ ${cuda_compiler_version} != "None" ]]; then
export TF_CUDA_COMPUTE_CAPABILITIES=sm_35,sm_50,sm_60,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,compute_86
elif [[ ${cuda_compiler_version} == 11.2 ]]; then
export TF_CUDA_COMPUTE_CAPABILITIES=sm_35,sm_50,sm_60,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,compute_86
+ elif [[ ${cuda_compiler_version} == 11.8 ]]; then
+ export TF_CUDA_COMPUTE_CAPABILITIES=sm_35,sm_50,sm_60,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,compute_86
else
echo "unsupported cuda version."
exit 1
From a6c08cec7d4f7f68f466cdbf801f281dc6fbfc9c Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Sun, 15 Oct 2023 10:22:37 +0200
Subject: [PATCH 27/28] Update recipe/build.sh
Co-authored-by: Jinzhe Zeng
---
recipe/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipe/build.sh b/recipe/build.sh
index 57fef616..a490ad9a 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -149,7 +149,7 @@ if [[ ${cuda_compiler_version} != "None" ]]; then
elif [[ ${cuda_compiler_version} == 11.2 ]]; then
export TF_CUDA_COMPUTE_CAPABILITIES=sm_35,sm_50,sm_60,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,compute_86
elif [[ ${cuda_compiler_version} == 11.8 ]]; then
- export TF_CUDA_COMPUTE_CAPABILITIES=sm_35,sm_50,sm_60,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,compute_86
+ export TF_CUDA_COMPUTE_CAPABILITIES=sm_35,sm_50,sm_60,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,sm_87,sm_89,sm_90,compute_90
else
echo "unsupported cuda version."
exit 1
From 8744ec0e878ba93aa38f0273e16760a766d7e853 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn"
Date: Mon, 16 Oct 2023 10:37:34 +0200
Subject: [PATCH 28/28] Fixes for clang-16
---
recipe/build.sh | 4 ++--
recipe/custom_toolchain/cc_toolchain_config.bzl | 1 +
recipe/gen-bazel-toolchain.sh | 3 +++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/recipe/build.sh b/recipe/build.sh
index a490ad9a..e5bb8a41 100644
--- a/recipe/build.sh
+++ b/recipe/build.sh
@@ -176,8 +176,8 @@ EOF
pushd tensorflow/lite/schema
flatc --cpp --gen-object-api schema.fbs
popd
-rm tensorflow/lite/schema/conversion_metadata_generated.h
-rm tensorflow/lite/experimental/acceleration/configuration/configuration_generated.h
+rm -f tensorflow/lite/schema/conversion_metadata_generated.h
+rm -f tensorflow/lite/experimental/acceleration/configuration/configuration_generated.h
# build using bazel
bazel ${BAZEL_OPTS} build ${BUILD_TARGET}
diff --git a/recipe/custom_toolchain/cc_toolchain_config.bzl b/recipe/custom_toolchain/cc_toolchain_config.bzl
index 195336b8..f504ffc1 100644
--- a/recipe/custom_toolchain/cc_toolchain_config.bzl
+++ b/recipe/custom_toolchain/cc_toolchain_config.bzl
@@ -284,6 +284,7 @@ def _impl(ctx):
"${CONDA_BUILD_SYSROOT}/System/Library/Frameworks",
"${CONDA_BUILD_SYSROOT}/usr/include",
"${BUILD_PREFIX}/lib/clang/${COMPILER_VERSION}/include",
+ "${BUILD_PREFIX}/lib/clang/${SHORT_COMPILER_VERSION}/include",
"${BUILD_PREFIX}/include/c++/v1",
"${PREFIX}/include",
]
diff --git a/recipe/gen-bazel-toolchain.sh b/recipe/gen-bazel-toolchain.sh
index e3b0849c..73208eae 100755
--- a/recipe/gen-bazel-toolchain.sh
+++ b/recipe/gen-bazel-toolchain.sh
@@ -15,6 +15,7 @@ function apply_cc_template() {
sed -ie "s:TARGET_PLATFORM:${target_platform}:" $1
sed -ie "s:\${CONDA_BUILD_SYSROOT}:${CONDA_BUILD_SYSROOT}:" $1
sed -ie "s:\${COMPILER_VERSION}:${BAZEL_TOOLCHAIN_COMPILER_VERSION:-}:" $1
+ sed -ie "s:\${SHORT_COMPILER_VERSION}:${SHORT_BAZEL_TOOLCHAIN_COMPILER_VERSION:-}:" $1
sed -ie "s:\${GCC_COMPILER_PATH}:${GCC:-}:" $1
sed -ie "s:\${BAZEL_TOOLCHAIN_GCC}:${BAZEL_TOOLCHAIN_GCC}:" $1
sed -ie "s:\${CUDA_VERSION}:${cuda_compiler_version:-}:" $1
@@ -41,6 +42,7 @@ cp -r ${RECIPE_DIR}/custom_toolchain .
pushd custom_toolchain
if [[ "${target_platform}" == osx-* ]]; then
export BAZEL_TOOLCHAIN_COMPILER_VERSION=$($CC -v 2>&1 | head -n1 | cut -d' ' -f3)
+ export SHORT_BAZEL_TOOLCHAIN_COMPILER_VERSION=$(echo ${BAZEL_TOOLCHAIN_COMPILER_VERSION} | cut -d. -f1)
sed -e "s:\${CLANG}:${CLANG}:" \
-e "s:\${target_platform}:${target_platform}:" \
-e "s:\${INSTALL_NAME_TOOL}:${INSTALL_NAME_TOOL}:" \
@@ -63,6 +65,7 @@ pushd custom_toolchain
export BAZEL_TOOLCHAIN_AR=${LIBTOOL}
else
export BAZEL_TOOLCHAIN_COMPILER_VERSION=$(${CC} -v 2>&1|tail -n1|cut -d' ' -f3)
+ export SHORT_BAZEL_TOOLCHAIN_COMPILER_VERSION=${BAZEL_TOOLCHAIN_COMPILER_VERSION}
export BAZEL_TOOLCHAIN_AR=$(basename ${AR})
touch cc_wrapper.sh