Date: Tue, 29 Dec 2020 22:42:13 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559629 - in head/math/or-tools: . files Message-ID: <202012292242.0BTMgD7X077299@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Tue Dec 29 22:42:13 2020 New Revision: 559629 URL: https://svnweb.freebsd.org/changeset/ports/559629 Log: math/or-tools: Update 7.7 -> 8.1 Deleted: head/math/or-tools/files/patch-ortools_util_fp__utils.h Modified: head/math/or-tools/Makefile head/math/or-tools/distinfo head/math/or-tools/pkg-plist Modified: head/math/or-tools/Makefile ============================================================================== --- head/math/or-tools/Makefile Tue Dec 29 22:40:49 2020 (r559628) +++ head/math/or-tools/Makefile Tue Dec 29 22:42:13 2020 (r559629) @@ -2,8 +2,7 @@ PORTNAME= or-tools DISTVERSIONPREFIX= v -DISTVERSION= 7.7 -PORTREVISION= 1 +DISTVERSION= 8.1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -20,13 +19,20 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libglog.so:devel/glog \ libprotobuf.so:devel/protobuf -USES= blaslapack cmake compiler:c++11-lang pkgconfig +USES= blaslapack cmake compiler:c++17-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= google USE_LDCONFIG= yes CMAKE_OFF= BUILD_DEPS INSTALL_BUILD_DEPS BUILD_PYTHON BUILD_EXAMPLES CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} + +OPTIONS_DEFINE= SCIP +#OPTIONS_DEFAULT= 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-configure: # https://github.com/google/or-tools/issues/2109 @${REINPLACE_CMD} -e 's|protobuf::protoc|protoc -I${LOCALBASE}/include| ; s|protobuf$$:$$:protoc||' ${BUILD_WRKSRC}/build.ninja Modified: head/math/or-tools/distinfo ============================================================================== --- head/math/or-tools/distinfo Tue Dec 29 22:40:49 2020 (r559628) +++ head/math/or-tools/distinfo Tue Dec 29 22:42:13 2020 (r559629) @@ -1,3 +1,3 @@ -TIMESTAMP = 1595281509 -SHA256 (google-or-tools-v7.7_GH0.tar.gz) = d20eb031ea3f1b75e55e44ae6acdb674ee6fb31e7a56498be32dc83ba9bc13bd -SIZE (google-or-tools-v7.7_GH0.tar.gz) = 184809285 +TIMESTAMP = 1607763769 +SHA256 (google-or-tools-v8.1_GH0.tar.gz) = beb9fe379977033151045d0815d26c628ad99d74d68b9f3b707578492723731e +SIZE (google-or-tools-v8.1_GH0.tar.gz) = 232290953 Modified: head/math/or-tools/pkg-plist ============================================================================== --- head/math/or-tools/pkg-plist Tue Dec 29 22:40:49 2020 (r559628) +++ head/math/or-tools/pkg-plist Tue Dec 29 22:42:13 2020 (r559629) @@ -1,34 +1,63 @@ -bin/costas_array_sat -bin/cvrp_disjoint_tw -bin/cvrptw -bin/cvrptw_with_breaks -bin/cvrptw_with_refueling -bin/cvrptw_with_resources -bin/cvrptw_with_stop_times_and_resources -bin/dimacs_assignment -bin/dobble_ls -bin/flow_api -bin/frequency_assignment_problem -bin/golomb_sat -bin/integer_programming -bin/jobshop_sat +bin/assignment_mip +bin/assignment_sat +bin/basic_example +bin/bin_packing_mip +bin/binpacking_problem_sat +bin/bool_or_sample_sat +bin/channeling_sample_sat +bin/cp_is_fun_sat +bin/earliness_tardiness_cost_sample_sat +bin/fz +bin/integer_programming_example +bin/interval_sample_sat bin/knapsack -bin/linear_assignment_api -bin/linear_programming -bin/linear_solver_protocol_buffers -bin/magic_square_sat -bin/max_flow -bin/min_cost_flow -bin/mps_driver -bin/network_routing_sat -bin/nqueens -bin/pdptw -bin/random_tsp -bin/shift_minimization_sat -bin/solve -bin/sports_scheduling_sat -bin/strawberry_fields_with_column_generation -bin/weighted_tardiness_sat +bin/linear_programming_example +bin/literal_sample_sat +bin/minimal_jobshop_cp +bin/mip_var_array +bin/multiple_knapsack_mip +bin/multiple_knapsack_sat +bin/no_overlap_sample_sat +bin/nurses_cp +bin/optional_interval_sample_sat +bin/rabbits_and_pheasants_cp +bin/rabbits_and_pheasants_sat +bin/ranking_sample_sat +bin/reified_sample_sat +bin/search_for_all_solutions_sample_sat +bin/simple_cp_program +bin/simple_knapsack_program +bin/simple_lp_program +bin/simple_ls_program +bin/simple_max_flow_program +bin/simple_min_cost_flow_program +bin/simple_mip_program +bin/simple_routing_program +bin/simple_sat_program +bin/solution_hinting_sample_sat +bin/solve_and_print_intermediate_solutions_sample_sat +bin/solve_with_time_limit_sample_sat +bin/step_function_sample_sat +bin/stop_after_n_solutions_sample_sat +bin/tsp +bin/tsp_circuit_board +bin/tsp_cities +bin/tsp_cities_routes +bin/tsp_distance_matrix +bin/vrp +bin/vrp_capacity +bin/vrp_drop_nodes +bin/vrp_global_span +bin/vrp_initial_routes +bin/vrp_pickup_delivery +bin/vrp_pickup_delivery_fifo +bin/vrp_pickup_delivery_lifo +bin/vrp_resources +bin/vrp_routes +bin/vrp_starts_ends +bin/vrp_time_windows +bin/vrp_with_time_limit +bin/vrptw_store_solution_data include/ortools/algorithms/dense_doubly_linked_list.h include/ortools/algorithms/dynamic_partition.h include/ortools/algorithms/dynamic_permutation.h @@ -45,16 +74,20 @@ include/ortools/base/basictypes.h include/ortools/base/bitmap.h include/ortools/base/cleanup.h include/ortools/base/commandlineflags.h +include/ortools/base/container_logging.h +include/ortools/base/dynamic_library.h include/ortools/base/encodingutils.h include/ortools/base/file.h include/ortools/base/filelineiter.h include/ortools/base/hash.h include/ortools/base/int_type.h -include/ortools/base/int_type_indexed_vector.h include/ortools/base/integral_types.h include/ortools/base/iterator_adaptors.h include/ortools/base/jniutil.h +include/ortools/base/log_severity.h include/ortools/base/logging.h +include/ortools/base/logging_export.h +include/ortools/base/logging_utilities.h include/ortools/base/macros.h include/ortools/base/map_util.h include/ortools/base/mathutil.h @@ -64,18 +97,22 @@ include/ortools/base/protoutil.h include/ortools/base/ptr_util.h include/ortools/base/python-swig.h include/ortools/base/random.h +include/ortools/base/raw_logging.h include/ortools/base/recordio.h include/ortools/base/small_map.h include/ortools/base/small_ordered_set.h +include/ortools/base/status_builder.h include/ortools/base/status_macros.h -include/ortools/base/statusor.h +include/ortools/base/stl_logging.h include/ortools/base/stl_util.h +include/ortools/base/strong_vector.h include/ortools/base/sysinfo.h include/ortools/base/thorough_hash.h include/ortools/base/threadpool.h include/ortools/base/timer.h include/ortools/base/typeid.h include/ortools/base/version.h +include/ortools/base/vlog_is_on.h include/ortools/bop/bop_base.h include/ortools/bop/bop_fs.h include/ortools/bop/bop_lns.h @@ -104,6 +141,7 @@ include/ortools/constraint_solver/routing_parameters.h include/ortools/constraint_solver/routing_parameters.pb.h include/ortools/constraint_solver/routing_types.h include/ortools/constraint_solver/search_limit.pb.h +include/ortools/constraint_solver/search_stats.pb.h include/ortools/constraint_solver/solver_parameters.pb.h include/ortools/data/jobshop_scheduling.pb.h include/ortools/data/jobshop_scheduling_parser.h @@ -139,7 +177,6 @@ include/ortools/graph/assignment.h include/ortools/graph/christofides.h include/ortools/graph/cliques.h include/ortools/graph/connected_components.h -include/ortools/graph/connectivity.h include/ortools/graph/ebert_graph.h include/ortools/graph/eulerian_path.h include/ortools/graph/flow_problem.pb.h @@ -156,7 +193,12 @@ include/ortools/graph/one_tree_lower_bound.h include/ortools/graph/perfect_matching.h include/ortools/graph/shortestpaths.h include/ortools/graph/strongly_connected_components.h +include/ortools/graph/topologicalsorter.h include/ortools/graph/util.h +include/ortools/gscip/gscip.h +include/ortools/gscip/gscip_ext.h +include/ortools/gscip/gscip_parameters.h +include/ortools/gscip/legacy_scip_params.h include/ortools/linear_solver/glop_utils.h include/ortools/linear_solver/gurobi_environment.h include/ortools/linear_solver/gurobi_proto_solver.h @@ -169,6 +211,7 @@ include/ortools/linear_solver/model_exporter_swig_help include/ortools/linear_solver/model_validator.h include/ortools/linear_solver/sat_proto_solver.h include/ortools/linear_solver/sat_solver_utils.h +include/ortools/linear_solver/scip_callback.h include/ortools/linear_solver/scip_helper_macros.h include/ortools/linear_solver/scip_proto_solver.h include/ortools/lp_data/lp_data.h @@ -246,6 +289,7 @@ include/ortools/sat/sat_decision.h include/ortools/sat/sat_inprocessing.h include/ortools/sat/sat_parameters.pb.h include/ortools/sat/sat_solver.h +include/ortools/sat/scheduling_constraints.h include/ortools/sat/simplification.h include/ortools/sat/subsolver.h include/ortools/sat/swig_helper.h @@ -256,6 +300,8 @@ include/ortools/sat/theta_tree.h include/ortools/sat/timetable.h include/ortools/sat/timetable_edgefinding.h include/ortools/sat/util.h +include/ortools/sat/var_domination.h +include/ortools/sat/zero_half_cuts.h include/ortools/util/adaptative_parameter_value.h include/ortools/util/affine_relation.h include/ortools/util/bitset.h @@ -285,6 +331,7 @@ include/ortools/util/sort.h include/ortools/util/sorted_interval_list.h include/ortools/util/stats.h include/ortools/util/string_array.h +include/ortools/util/testing_utils.h include/ortools/util/time_limit.h include/ortools/util/tuple_set.h include/ortools/util/vector_map.h @@ -295,6 +342,24 @@ lib/cmake/ortools/ortoolsConfig.cmake lib/cmake/ortools/ortoolsConfigVersion.cmake lib/cmake/ortools/ortoolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/ortools/ortoolsTargets.cmake +lib/libflatzinc.so +lib/libflatzinc.so.8 +lib/libflatzinc.so.8.1.9999 lib/libortools.so -lib/libortools.so.7 -lib/libortools.so.7.7.9999 +lib/libortools.so.8 +lib/libortools.so.8.1.9999 +share/minizinc/ortools/fzn_all_different_int.mzn +share/minizinc/ortools/fzn_circuit.mzn +share/minizinc/ortools/fzn_cumulative.mzn +share/minizinc/ortools/fzn_diffn.mzn +share/minizinc/ortools/fzn_diffn_nonstrict.mzn +share/minizinc/ortools/fzn_inverse.mzn +share/minizinc/ortools/fzn_network_flow.mzn +share/minizinc/ortools/fzn_network_flow_cost.mzn +share/minizinc/ortools/fzn_regular.mzn +share/minizinc/ortools/fzn_subcircuit.mzn +share/minizinc/ortools/fzn_table_bool.mzn +share/minizinc/ortools/fzn_table_int.mzn +share/minizinc/ortools/nostrings.mzn +share/minizinc/ortools/redefinitions-2.0.mzn +share/minizinc/solvers/ortools.msc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012292242.0BTMgD7X077299>