c++: Add USE_LP_PARSER define (#3201)

google · Mar 24, 2022 · c505f3d · c505f3d
1 parent 23a295f
commit c505f3d
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 7 deletions.
diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
@@ -19,6 +19,9 @@ list(APPEND OR_TOOLS_COMPILE_DEFINITIONS
   "USE_BOP" # enable BOP support
   "USE_GLOP" # enable GLOP support
   )
+if(BUILD_LP_PARSER)
+  list(APPEND OR_TOOLS_COMPILE_DEFINITIONS "USE_LP_PARSER")
+endif()
 if(USE_COINOR)
   list(APPEND OR_TOOLS_COMPILE_DEFINITIONS
     "USE_CBC" # enable COIN-OR CBC support

diff --git a/ortools/lp_data/BUILD.bazel b/ortools/lp_data/BUILD.bazel
@@ -239,6 +239,7 @@ cc_library(
         "@com_google_absl//absl/strings",
         "@com_google_re2//:re2",
     ],
+    defines = ["USE_LP_PARSER"],
 )
 
 #cc_library(

diff --git a/ortools/lp_data/CMakeLists.txt b/ortools/lp_data/CMakeLists.txt
@@ -1,9 +1,4 @@
 file(GLOB _SRCS "*.h" "*.cc")
-if(NOT BUILD_LP_PARSER)
-  list(FILTER _SRCS EXCLUDE REGEX ".*/lp_parser.h")
-  list(FILTER _SRCS EXCLUDE REGEX ".*/lp_parser.cc")
-endif()
-
 set(NAME ${PROJECT_NAME}_lp_data)
 
 # Will be merge in libortools.so

diff --git a/ortools/lp_data/lp_parser.cc b/ortools/lp_data/lp_parser.cc
@@ -10,6 +10,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#if defined(USE_LP_PARSER)
 
 #include "ortools/lp_data/lp_parser.h"
 
@@ -461,3 +462,4 @@ absl::StatusOr<MPModelProto> ModelProtoFromLpFormat(absl::string_view model) {
 }
 
 }  // namespace operations_research
+#endif  // #if defined(USE_LP_PARSER)
diff --git a/ortools/lp_data/lp_parser.h b/ortools/lp_data/lp_parser.h
@@ -74,6 +74,8 @@
 #ifndef OR_TOOLS_LP_DATA_LP_PARSER_H_
 #define OR_TOOLS_LP_DATA_LP_PARSER_H_
 
+#if defined(USE_LP_PARSER)
+
 #include <string>
 #include <vector>
 
@@ -121,4 +123,6 @@ absl::StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint);
 }  // namespace glop
 }  // namespace operations_research
 
+#endif  // #if defined(USE_LP_PARSER)
+
 #endif  // OR_TOOLS_LP_DATA_LP_PARSER_H_
diff --git a/ortools/model_builder/python/pywrap_model_builder_helper.cc b/ortools/model_builder/python/pywrap_model_builder_helper.cc
@@ -123,10 +123,12 @@ PYBIND11_MODULE(pywrap_model_builder_helper, m) {
            arg("mps_string"))
       .def("ImportFromMpsFile", &ModelBuilderHelper::ImportFromMpsFile,
            arg("mps_file"))
+#if defined(USE_LP_PARSER)
       .def("ImportFromLpString", &ModelBuilderHelper::ImportFromLpString,
            arg("lp_string"))
       .def("ImportFromLpFile", &ModelBuilderHelper::ImportFromLpFile,
            arg("lp_file"))
+#endif // #if defined(USE_LP_PARSER)
       .def(
           "FillModelFromSparseData",
           [](ModelBuilderHelper* helper,

diff --git a/ortools/model_builder/wrappers/model_builder_helper.cc b/ortools/model_builder/wrappers/model_builder_helper.cc
@@ -19,7 +19,9 @@
 
 #include "ortools/linear_solver/linear_solver.h"
 #include "ortools/linear_solver/linear_solver.pb.h"
+#if defined(USE_LP_PARSER)
 #include "ortools/lp_data/lp_parser.h"
+#endif // #if defined(USE_LP_PARSER)
 #include "ortools/lp_data/mps_reader.h"
 
 namespace operations_research {
@@ -72,6 +74,7 @@ bool ModelBuilderHelper::ImportFromMpsFile(const std::string& mps_file) {
   return true;
 }
 
+#if defined(USE_LP_PARSER)
 bool ModelBuilderHelper::ImportFromLpString(const std::string& lp_string) {
   absl::StatusOr<MPModelProto> model_or = ModelProtoFromLpFormat(lp_string);
   if (!model_or.ok()) return false;
@@ -85,6 +88,7 @@ bool ModelBuilderHelper::ImportFromLpFile(const std::string& lp_file) {
   *request_.mutable_model() = model_or.value();
   return true;
 }
+#endif // #if defined(USE_LP_PARSER)
 
 const MPModelRequest& ModelBuilderHelper::request() const { return request_; }
 MPModelProto* ModelBuilderHelper::mutable_model() {

diff --git a/ortools/model_builder/wrappers/model_builder_helper.h b/ortools/model_builder/wrappers/model_builder_helper.h
@@ -53,8 +53,10 @@ class ModelBuilderHelper {
 
   bool ImportFromMpsString(const std::string& mps_string);
   bool ImportFromMpsFile(const std::string& mps_file);
+#if defined(USE_LP_PARSER)
   bool ImportFromLpString(const std::string& lp_string);
   bool ImportFromLpFile(const std::string& lp_file);
+#endif // #if defined(USE_LP_PARSER)
 
   const operations_research::MPModelRequest& request() const;
   MPModelProto* mutable_model();

diff --git a/tools/Makefile.cc.java.dotnet b/tools/Makefile.cc.java.dotnet
@@ -69,7 +69,7 @@ ifeq ($(SYSTEM),unix)
   DEBUG = -O4 -DNDEBUG
   CXXFLAGS = -fPIC -std=c++17 $(DEBUG) \
  -I$(INC_DIR) -I. $(ARCH) -Wno-deprecated \
- -DUSE_BOP -DUSE_GLOP -DUSE_PDLP \
+ -DUSE_BOP -DUSE_GLOP -DUSE_PDLP -DUSE_LP_PARSER \
  -DUSE_CBC -DUSE_CLP \
  -DUSE_SCIP
   LIB_PREFIX = lib
@@ -132,7 +132,7 @@ ifeq ($(SYSTEM),win)
     /DPSAPI_VERSION=1 /D__WIN32__ /DNOMINMAX /DWIN32_LEAN_AND_MEAN=1 /D_CRT_SECURE_NO_WARNINGS \
     /DGOOGLE_GLOG_DLL_DECL= \
     /I$(INC_DIR)\\src\\windows /I$(INC_DIR) /I. \
-    /DUSE_BOP /DUSE_GLOP /DUSE_PDLP \
+    /DUSE_BOP /DUSE_GLOP /DUSE_PDLP /DUSE_LP_PARSER \
     /DUSE_CBC /DUSE_CLP \
     /DUSE_SCIP
   LDFLAGS = psapi.lib ws2_32.lib