diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile index 701a29736dcb..af592a1f4c0b 100644 --- a/math/py-or-tools/Makefile +++ b/math/py-or-tools/Makefile @@ -1,88 +1,89 @@ PORTNAME= or-tools DISTVERSIONPREFIX= v -DISTVERSION= 9.5 -PORTREVISION= 9 +DISTVERSION= 9.6 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Google's Operations Research tools (Python binding) WWW= https://github.com/google/or-tools LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv7= SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32 BROKEN_i386= SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32 # see https://github.com/google/or-tools/issues/2130 PY_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}absl-py>0:devel/py-absl-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} \ ${PY_SETUPTOOLS} \ pybind11>0:devel/pybind11 \ protoc-gen-mypy:devel/py-mypy-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} \ swig:devel/swig LIB_DEPENDS= libabsl_base.so:devel/abseil \ libCbc.so:math/cbc \ libCgl.so:math/cgl \ libcoinasl.so:math/asl \ libcoinmumps.so:math/coin-or-mumps \ libCoinUtils.so:math/coinutils \ libnauty.so:math/nauty \ libopenblas.so:math/openblas \ libOsi.so:math/osi \ libOsiClp.so:math/clp \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ libprotobuf.so:devel/protobuf \ libre2.so:devel/re2 RUN_DEPENDS= ${PY_DEPENDS} USES= blaslapack cmake:insource compiler:c++17-lang eigen:3 pkgconfig python USE_PYTHON= flavors pytest # tests fail, see https://github.com/google/or-tools/issues/3464 USE_GITHUB= yes GH_ACCOUNT= google CMAKE_OFF= BUILD_DEPS BUILD_pybind11 INSTALL_BUILD_DEPS BUILD_TESTING BUILD_EXAMPLES CMAKE_ON= BUILD_PYTHON CMAKE_ARGS= -DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig -DFREEBSD_PYTHON_VER=${PYTHON_VER} CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} CXXFLAGS+= -DABSL_LEGACY_THREAD_ANNOTATIONS BUILD_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} OPTIONS_DEFINE= SCIP SCIP_DESC= Use the SCIP solver # SCIP package isn't built because of licensing restrictions SCIP_CMAKE_BOOL= USE_SCIP SCIP_LIB_DEPENDS= libscip.so:math/SCIP post-patch: @${REINPLACE_CMD} -e '/absl::container/s,^,#,' \ ${WRKSRC}/ortools/constraint_solver/CMakeLists.txt \ ${WRKSRC}/ortools/glop/CMakeLists.txt \ ${WRKSRC}/ortools/linear_solver/CMakeLists.txt \ ${WRKSRC}/ortools/sat/CMakeLists.txt + @${REINPLACE_CMD} -e '17,19d ; /AbslStringify/,+10d' \ + ${WRKSRC}/ortools/base/logging.h do-install: # by default cmake installs the whole or-tools project without the python part, so extract the wheel and install python files manually here ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} && \ unzip ${BUILD_WRKSRC}/python/dist/ortools-${DISTVERSION}*.whl && \ ${RM} -rf ortools-*.dist-info ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" -o -name "*.so.*" | ${XARGS} ${STRIP_CMD} run-examples: # one of the examples fail: https://github.com/google/or-tools/issues/3463 .for e in arc_flow_cutting_stock_sat.py bus_driver_scheduling_sat.py cover_rectangle_sat.py cvrptw_plot.py qubo_sat.py # list is from examples/python/CMakeLists.txt @cd ${WRKSRC}/examples/python && \ ${ECHO} "==> Running ${PORTNAME} test ${e} ..." && \ ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${e} && \ ${ECHO} "... test ${e} succeeded" .endfor .include diff --git a/math/py-or-tools/distinfo b/math/py-or-tools/distinfo index f3b496e5344c..300375641e49 100644 --- a/math/py-or-tools/distinfo +++ b/math/py-or-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672604938 -SHA256 (google-or-tools-v9.5_GH0.tar.gz) = 57f81b94949d35dc042690db3fa3f53245cffbf6824656e1a03f103a3623c939 -SIZE (google-or-tools-v9.5_GH0.tar.gz) = 14795911 +TIMESTAMP = 1678436391 +SHA256 (google-or-tools-v9.6_GH0.tar.gz) = bc4b07dc9c23f0cca43b1f5c889f08a59c8f2515836b03d4cc7e0f8f2c879234 +SIZE (google-or-tools-v9.6_GH0.tar.gz) = 19252960 diff --git a/math/py-or-tools/pkg-plist b/math/py-or-tools/pkg-plist index 9fa42e4ba88a..92504e12116f 100644 --- a/math/py-or-tools/pkg-plist +++ b/math/py-or-tools/pkg-plist @@ -1,82 +1,85 @@ %%PYTHON_SITELIBDIR%%/ortools/.libs/libortools.so.9 %%PYTHON_SITELIBDIR%%/ortools/__init__.py %%PYTHON_SITELIBDIR%%/ortools/algorithms/__init__.py %%PYTHON_SITELIBDIR%%/ortools/algorithms/_pywrapknapsack_solver.so %%PYTHON_SITELIBDIR%%/ortools/algorithms/pywrapknapsack_solver.py %%PYTHON_SITELIBDIR%%/ortools/bop/__init__.py %%PYTHON_SITELIBDIR%%/ortools/bop/bop_parameters_pb2.py %%PYTHON_SITELIBDIR%%/ortools/bop/bop_parameters_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/__init__.py %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/_pywrapcp.so %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/assignment_pb2.py %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/assignment_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/pywrapcp.py %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/routing_enums_pb2.py %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/routing_enums_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/routing_parameters_pb2.py %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/routing_parameters_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/search_limit_pb2.py %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/search_limit_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/search_stats_pb2.py %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/search_stats_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/solver_parameters_pb2.py %%PYTHON_SITELIBDIR%%/ortools/constraint_solver/solver_parameters_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/glop/__init__.py %%PYTHON_SITELIBDIR%%/ortools/glop/parameters_pb2.py %%PYTHON_SITELIBDIR%%/ortools/glop/parameters_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/graph/__init__.py %%PYTHON_SITELIBDIR%%/ortools/graph/flow_problem_pb2.py %%PYTHON_SITELIBDIR%%/ortools/graph/python/__init__.py %%PYTHON_SITELIBDIR%%/ortools/graph/python/linear_sum_assignment%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/ortools/graph/python/max_flow%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/ortools/graph/python/min_cost_flow%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/ortools/init/__init__.py %%PYTHON_SITELIBDIR%%/ortools/init/_pywrapinit.so %%PYTHON_SITELIBDIR%%/ortools/init/pywrapinit.py %%PYTHON_SITELIBDIR%%/ortools/linear_solver/__init__.py %%PYTHON_SITELIBDIR%%/ortools/linear_solver/_pywraplp.so %%PYTHON_SITELIBDIR%%/ortools/linear_solver/linear_solver_natural_api.py %%PYTHON_SITELIBDIR%%/ortools/linear_solver/linear_solver_pb2.py %%PYTHON_SITELIBDIR%%/ortools/linear_solver/linear_solver_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/linear_solver/python/__init__.py %%PYTHON_SITELIBDIR%%/ortools/linear_solver/python/model_builder.py %%PYTHON_SITELIBDIR%%/ortools/linear_solver/python/model_builder_helper.py %%PYTHON_SITELIBDIR%%/ortools/linear_solver/python/pywrap_model_builder_helper%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/ortools/linear_solver/pywraplp.py %%PYTHON_SITELIBDIR%%/ortools/packing/__init__.py %%PYTHON_SITELIBDIR%%/ortools/packing/multiple_dimensions_bin_packing_pb2.py %%PYTHON_SITELIBDIR%%/ortools/packing/multiple_dimensions_bin_packing_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/packing/vector_bin_packing_pb2.py %%PYTHON_SITELIBDIR%%/ortools/packing/vector_bin_packing_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/pdlp/__init__.py +%%PYTHON_SITELIBDIR%%/ortools/pdlp/python/__init__.py +%%PYTHON_SITELIBDIR%%/ortools/pdlp/python/pywrap_pdlp%%PYTHON_EXT_SUFFIX%%.so %%PYTHON_SITELIBDIR%%/ortools/pdlp/solve_log_pb2.py %%PYTHON_SITELIBDIR%%/ortools/pdlp/solve_log_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/pdlp/solvers_pb2.py %%PYTHON_SITELIBDIR%%/ortools/pdlp/solvers_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/sat/__init__.py %%PYTHON_SITELIBDIR%%/ortools/sat/boolean_problem_pb2.py %%PYTHON_SITELIBDIR%%/ortools/sat/boolean_problem_pb2.pyi +%%PYTHON_SITELIBDIR%%/ortools/sat/colab/__init__.py +%%PYTHON_SITELIBDIR%%/ortools/sat/colab/visualization.py %%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_pb2.py %%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_service_pb2.py %%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_service_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/sat/python/__init__.py %%PYTHON_SITELIBDIR%%/ortools/sat/python/cp_model.py %%PYTHON_SITELIBDIR%%/ortools/sat/python/cp_model_helper.py %%PYTHON_SITELIBDIR%%/ortools/sat/python/swig_helper%%PYTHON_EXT_SUFFIX%%.so -%%PYTHON_SITELIBDIR%%/ortools/sat/python/visualization.py %%PYTHON_SITELIBDIR%%/ortools/sat/sat_parameters_pb2.py %%PYTHON_SITELIBDIR%%/ortools/sat/sat_parameters_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/scheduling/__init__.py %%PYTHON_SITELIBDIR%%/ortools/scheduling/_pywraprcpsp.so %%PYTHON_SITELIBDIR%%/ortools/scheduling/course_scheduling_pb2.py %%PYTHON_SITELIBDIR%%/ortools/scheduling/course_scheduling_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/scheduling/jobshop_scheduling_pb2.py %%PYTHON_SITELIBDIR%%/ortools/scheduling/jobshop_scheduling_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/scheduling/pywraprcpsp.py %%PYTHON_SITELIBDIR%%/ortools/scheduling/rcpsp_pb2.py %%PYTHON_SITELIBDIR%%/ortools/scheduling/rcpsp_pb2.pyi %%PYTHON_SITELIBDIR%%/ortools/util/__init__.py %%PYTHON_SITELIBDIR%%/ortools/util/optional_boolean_pb2.py %%PYTHON_SITELIBDIR%%/ortools/util/python/__init__.py %%PYTHON_SITELIBDIR%%/ortools/util/python/sorted_interval_list%%PYTHON_EXT_SUFFIX%%.so