Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

or-tools v9.4 #23

Merged
merged 18 commits into from
Mar 6, 2023
Merged

or-tools v9.4 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
dcad719
add re2 host dep
h-vetinari Sep 10, 2022
ed3ccfb
updated v9.4
regro-cf-autotick-bot Aug 11, 2022
2b0c6e6
Revert "build for both current protobufs"
h-vetinari Sep 10, 2022
93eb60e
ensure we're using C++17
h-vetinari Feb 15, 2023
6e56037
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and co…
h-vetinari Feb 15, 2023
e45709b
add eigen as host-dep
h-vetinari Feb 15, 2023
d9f5228
use ninja
h-vetinari Feb 15, 2023
1a5f53a
add abseil & new re2 migrators
h-vetinari Mar 4, 2023
caf1a78
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and co…
h-vetinari Mar 4, 2023
13584a5
fix macro that needs renaming
h-vetinari Mar 4, 2023
bfb6569
update license_file
h-vetinari Mar 4, 2023
1c6adda
sort host dependencies of python bindings
h-vetinari Mar 4, 2023
8f7a2a1
add re2 host-dep for python bindings; use our own pybind11
h-vetinari Mar 4, 2023
3121a08
eigen host-dep also for ortools-python
h-vetinari Mar 4, 2023
baa2b70
avoid swig 4.1 for now
h-vetinari Mar 4, 2023
bebe1eb
need python as build-dep to anchor correct version
h-vetinari Mar 5, 2023
f5e879d
rename ortools-cpp to libortools; keep compatibility output
h-vetinari Mar 5, 2023
978bd2e
add run_exports
h-vetinari Mar 5, 2023
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: 0 additions & 4 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions .ci_support/linux_64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos6
channel_sources:
Expand All @@ -21,11 +21,11 @@ coin_or_utils:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20220623.0'
- '20230125'
libprotobuf:
- '3.21'
numpy:
Expand All @@ -36,6 +36,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.10.* *_cpython
re2:
- 2023.02.02
target_platform:
- linux-64
zip_keys:
Expand Down
47 changes: 0 additions & 47 deletions .ci_support/linux_64_python3.7.____cpython.yaml
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions .ci_support/linux_64_python3.8.____73_pypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos6
channel_sources:
Expand All @@ -21,11 +21,11 @@ coin_or_utils:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20220623.0'
- '20230125'
libprotobuf:
- '3.21'
numpy:
Expand All @@ -36,6 +36,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.8.* *_73_pypy
re2:
- 2023.02.02
target_platform:
- linux-64
zip_keys:
Expand Down
8 changes: 5 additions & 3 deletions .ci_support/linux_64_python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos6
channel_sources:
Expand All @@ -21,11 +21,11 @@ coin_or_utils:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20220623.0'
- '20230125'
libprotobuf:
- '3.21'
numpy:
Expand All @@ -36,6 +36,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.8.* *_cpython
re2:
- 2023.02.02
target_platform:
- linux-64
zip_keys:
Expand Down
8 changes: 5 additions & 3 deletions .ci_support/linux_64_python3.9.____73_pypy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos6
channel_sources:
Expand All @@ -21,11 +21,11 @@ coin_or_utils:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20220623.0'
- '20230125'
libprotobuf:
- '3.21'
numpy:
Expand All @@ -36,6 +36,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_73_pypy
re2:
- 2023.02.02
target_platform:
- linux-64
zip_keys:
Expand Down
8 changes: 5 additions & 3 deletions .ci_support/linux_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos6
channel_sources:
Expand All @@ -21,11 +21,11 @@ coin_or_utils:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libabseil:
- '20220623.0'
- '20230125'
libprotobuf:
- '3.21'
numpy:
Expand All @@ -36,6 +36,8 @@ pin_run_as_build:
max_pin: x.x
python:
- 3.9.* *_cpython
re2:
- 2023.02.02
target_platform:
- linux-64
zip_keys:
Expand Down
7 changes: 7 additions & 0 deletions .ci_support/migrations/libabseil20230125.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
__migrator:
build_number: 1
kind: version
migration_number: 1
libabseil:
- '20230125'
migrator_ts: 1676218104.8853533
6 changes: 3 additions & 3 deletions .ci_support/migrations/libprotobuf321.yaml → .ci_support/migrations/re220230202.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ __migrator:
build_number: 1
kind: version
migration_number: 1
libprotobuf:
- '3.21'
migrator_ts: 1661531047.2553904
migrator_ts: 1677434562.0578406
re2:
- 2023.02.02
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 9 additions & 16 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion recipe/build-cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
#!/bin/sh
set -ex

cmake ${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=$PREFIX \
cmake -G Ninja \
${CMAKE_ARGS} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
-DBUILD_SHARED_LIBS=ON \
-BUILD_DEPS=OFF \
-DUSE_SCIP=OFF \
Expand Down
7 changes: 6 additions & 1 deletion recipe/build-python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
#!/bin/sh
set -ex

cmake ${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=$PREFIX \
cmake -G Ninja \
${CMAKE_ARGS} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_DEPS=OFF \
-DUSE_SCIP=OFF \
Expand All @@ -11,6 +15,7 @@ cmake ${CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=$PREFIX \
-DBUILD_SAMPLES=OFF \
-DBUILD_EXAMPLES=OFF \
-DBUILD_PYTHON=ON \
-DBUILD_pybind11=OFF \
-DFETCH_PYTHON_DEPS=OFF \
-DBUILD_TESTING=OFF \
-DPython3_EXECUTABLE="$PYTHON"
Expand Down
4 changes: 0 additions & 4 deletions recipe/conda_build_config.yaml
View file
Open in desktop

This file was deleted.

Loading