Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci_support/linux_64_python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
github_actions_labels:
- cirun-openstack-cpu-4xlarge
libgrpc:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
github_actions_labels:
- cirun-openstack-cpu-4xlarge
libgrpc:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
github_actions_labels:
- cirun-openstack-cpu-4xlarge
libgrpc:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
github_actions_labels:
- cirun-openstack-cpu-4xlarge
libgrpc:
Expand Down
21 changes: 21 additions & 0 deletions .ci_support/migrations/absl_grpc_proto.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
__migrator:
build_number: 1
commit_message: Rebuild for libabseil 20250127, libgrpc 1.71 & libprotobuf 5.29.3
kind: version
migration_number: 1
exclude:
- abseil-cpp
- grpc-cpp
- libprotobuf
- protobuf
- re2
libabseil:
- 20250127
libgrpc:
- "1.71"
libprotobuf:
- 5.29.3
# see https://github.com/grpc/grpc/commit/14ac94d923b80650e0df55bed17be5efa0e4becd
c_stdlib_version: # [osx and x86_64]
- 10.14 # [osx and x86_64]
migrator_ts: 1741118046.5882597
8 changes: 4 additions & 4 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ jobs:
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_python3.10.____cpython', 'linux', 'x64', 'self-hosted']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
- CONFIG: linux_64_python3.11.____cpython
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_python3.11.____cpython', 'linux', 'x64', 'self-hosted']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
- CONFIG: linux_64_python3.12.____cpython
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_python3.12.____cpython', 'linux', 'x64', 'self-hosted']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
- CONFIG: linux_64_python3.9.____cpython
UPLOAD_PACKAGES: True
os: ubuntu
runs_on: ['cirun-openstack-cpu-4xlarge--${{ github.run_id }}-linux_64_python3.9.____cpython', 'linux', 'x64', 'self-hosted']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
steps:

- name: Checkout code
Expand Down
12 changes: 4 additions & 8 deletions recipe/build-core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,13 @@ if [[ "$target_platform" == osx* ]]; then
sed -i"''" -e'/stdlib=libc/d' $CONDA_PREFIX/share/bazel_toolchain/CROSSTOOL.template
source gen-bazel-toolchain
cat >> .bazelrc <<EOF
build --define CONDA_CC=${CC}
build --define CONDA_CFLAGS="${CFLAGS}"
build --define CONDA_AR=${AR}
build --define CONDA_NM=${NM}
build --define CONDA_RANLIB=${RANLIB}
build --define CONDA_SDKROOT=${SDKROOT}
# build --subcommands
build --crosstool_top=//bazel_toolchain:toolchain
build --cpu=${TARGET_CPU}
build --platforms=//bazel_toolchain:target_platform
build --host_platform=//bazel_toolchain:build_platform
build --extra_toolchains=//bazel_toolchain:cc_cf_toolchain
build --extra_toolchains=//bazel_toolchain:cc_cf_host_toolchain
build --crosstool_top=//bazel_toolchain:toolchain
build --cpu=${TARGET_CPU}
build --experimental_ui_max_stdouterr_bytes=16000000
build --local_ram_resources=HOST_RAM*.8 --local_cpu_resources=2
EOF
Expand Down
9 changes: 0 additions & 9 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
cuda_compiler_version: # [linux64]
- None # [linux64]
docker_image: # [linux64]
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64]
cudnn: # [linux64]
- undefined # [linux64]
cdt_name: # [linux64]
- cos7 # [linux64]

c_stdlib_version: # [osx and x86_64]
- '10.15' # [osx and x86_64]
MACOSX_SDK_VERSION: # [osx and x86_64]
Expand Down
14 changes: 7 additions & 7 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ source:
# See https://github.com/conda-forge/ray-packages-feedstock/issues/136
# Keep in sync with current or active migration of libgrpc to avoid
# ABI breakage
- patches/0004-Vendor-grpc-1.67.1.patch
- patches/0004-Vendor-grpc-1.71.0.patch
- patches/0005-remove-stdlib-libc-from-.bazelrc.patch
# Patch around non-const NAN on windows in protobuf 27.5
- patches/0006-patch-protobuf-use-of-nan-on-windows.patch
- patches/0007-patch-zlib-in-prometheus-cpp-and-boost.patch
- patches/0006-patch-zlib-in-prometheus-cpp-and-boost.patch
# Add missing include in new logging code for different absl
- patches/0008-add-missing-include.patch
- patches/0007-add-missing-include.patch
# Patch bundled fmtlib/fmt in spdlog for char8_type which is invalid on macOS
- patches/0009-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch
- patches/0008-patch-bundled-fmt-in-spdlog-for-invalid-char8_type.patch
# Newer libgrpc does not need to patch zlib
- patches/0009-remove-zlib-patching-for-fdopen-on-macos.patch

build:
number: 0
number: 1

# Need these up here for conda-smithy to handle them properly.
requirements:
Expand Down
7 changes: 2 additions & 5 deletions recipe/patches/0001-Disable-making-entry-scripts.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 4572d7fc7e2cbf02c2d520577d7c50344b272c64 Mon Sep 17 00:00:00 2001
From 40f7950780aa2a522a9daf866f91b10e96c9b68e Mon Sep 17 00:00:00 2001
From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
Date: Tue, 10 Nov 2020 23:26:35 +0300
Subject: [PATCH 1/9] Disable making entry scripts
Subject: [PATCH 1/8] Disable making entry scripts

---
python/setup.py | 6 +++---
Expand All @@ -24,6 +24,3 @@ index 838f3aa744..c287eb4cc1 100644
]
},
package_data={
--
2.43.0

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 4d2046a891d75eb52f0837fe41065756dc2cf642 Mon Sep 17 00:00:00 2001
From 9c56c8b45e86273f7ffe9e2e5bbf9b8321599048 Mon Sep 17 00:00:00 2001
From: Vasily Litvinov <vasilij.n.litvinov@intel.com>
Date: Fri, 9 May 2025 13:12:32 +0300
Subject: [PATCH 2/9] Ignore warnings in event.cc and logging.cc
Date: Sun, 19 Jan 2025 22:56:08 +1100
Subject: [PATCH 2/8] Ignore warnings in event.cc and logging.cc

---
.bazelrc | 3 +++
1 file changed, 3 insertions(+)

diff --git a/.bazelrc b/.bazelrc
index 13774dda7c..575538c5f1 100644
index 13774dda7c..7db790a4bf 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -57,6 +57,9 @@ build:clang-cl --per_file_copt="-\\.(asm|S)$@-Werror"
Expand All @@ -21,6 +21,3 @@ index 13774dda7c..575538c5f1 100644
build:linux --per_file_copt="-\\.(asm|S)$,external/.*@-w,-Wno-error=implicit-function-declaration,-Wno-error=unused-function"
build:macos --per_file_copt="-\\.(asm|S)$,external/.*@-w,-Wno-error=implicit-function-declaration,-Wno-error=unused-function,-Wno-missing-template-arg-list-after-template-kw"
# Ignore warnings for host tools, which we generally can't control.
--
2.43.0

7 changes: 2 additions & 5 deletions recipe/patches/0003-remove-dependencies.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2595ec41a9d00d40b8b56442087f109307f403ec Mon Sep 17 00:00:00 2001
From 1b737bc4a1a98662566759c6b3f73ecfe2fabb0c Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Fri, 28 Feb 2025 15:22:50 +0200
Subject: [PATCH 3/9] remove dependencies
Subject: [PATCH 3/8] remove dependencies

---
python/setup.py | 159 +++++-------------------------------------------
Expand Down Expand Up @@ -203,6 +203,3 @@ index c287eb4cc1..25b08d3540 100644
extras_require=setup_spec.extras,
entry_points={
"console_scripts": [
--
2.43.0

Loading
Loading