redefinition?

Author: galabovaa

BUILD.bazel

@@ -50,8 +50,8 @@ cuda_library(
 cc_library(
     name = "highs",
     srcs = ["highs/interfaces/highs_c_api.cpp"] + glob([
-        "extern/filereaderlp/*.cpp",
         "highs/io/*.cpp",
+        "highs/io/filereaderlp/*.cpp",
         "highs/ipm/*.cpp",
         "highs/ipm/ipx/*.cc",
         "highs/ipm/basiclu/*.c",
@@ -71,8 +71,8 @@ cc_library(
         "highs/mip/feasibilityjump.hh",
     ] + glob([
         "**/*.h",
+        "highs/io/filereaderlp/*.cpp",
         "highs/qpsolver/*.hpp",
-        "extern/filereaderlp/*.hpp",
         "extern/zstr/*.hpp",
     ]),
     copts = select({

cmake/sources-python.cmake

@@ -1,11 +1,11 @@
 set(include_dirs_python
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern>
-    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/filereader>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/pdqsort>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/zstr>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/interfaces>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/io>
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/io/filereader>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/ipm>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/ipm/ipx>
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/ipm/basiclu>
@@ -176,7 +176,6 @@ set(ipx_sources_python
   highs/ipm/ipx/utils.h)
 
 set(highs_sources_python
-    extern/filereaderlp/reader.cpp
     highs/interfaces/highs_c_api.cpp
     highs/io/Filereader.cpp
     highs/io/FilereaderEms.cpp
@@ -186,6 +185,7 @@ set(highs_sources_python
     highs/io/HMpsFF.cpp
     highs/io/HMPSIO.cpp
     highs/io/LoadOptions.cpp
+    highs/io/filereaderlp/reader.cpp
     highs/ipm/IpxWrapper.cpp
     highs/lp_data/Highs.cpp
     highs/lp_data/HighsCallback.cpp
@@ -286,10 +286,6 @@ set(highs_sources_python
     highs/util/stringutil.cpp)
 
 set(highs_headers_python
-    extern/filereaderlp/builder.hpp
-    extern/filereaderlp/def.hpp
-    extern/filereaderlp/model.hpp
-    extern/filereaderlp/reader.hpp
     extern/pdqsort/pdqsort.h
     highs/interfaces/highs_c_api.h
     highs/io/Filereader.h
@@ -300,6 +296,10 @@ set(highs_headers_python
     highs/io/HMpsFF.h
     highs/io/HMPSIO.h
     highs/io/LoadOptions.h
+    highs/io/filereaderlp/builder.hpp
+    highs/io/filereaderlp/def.hpp
+    highs/io/filereaderlp/model.hpp
+    highs/io/filereaderlp/reader.hpp
     highs/ipm/IpxSolution.h
     highs/ipm/IpxWrapper.h
     highs/lp_data/HConst.h

cmake/sources.cmake

@@ -1,11 +1,11 @@
 set(include_dirs
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern>
-  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/filereader>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/pdqsort>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/extern/zstr>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/interfaces>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/io>
+  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/io/filereader>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/ipm>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/ipm/ipx>
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/highs/ipm/basiclu>
@@ -325,10 +325,9 @@ set(hipo_orderings_headers
     ../extern/rcm/rcm.h)
 
 # redefinition of 'kHighsInf'
-set_source_files_properties (../extern/filereaderlp/reader.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
+set_source_files_properties (io/filereaderlp/reader.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
 
 set(highs_sources
-    ../extern/filereaderlp/reader.cpp
     interfaces/highs_c_api.cpp
     io/Filereader.cpp
     io/FilereaderEms.cpp
@@ -338,6 +337,7 @@ set(highs_sources
     io/HMpsFF.cpp
     io/HMPSIO.cpp
     io/LoadOptions.cpp
+    io/filereaderlp/reader.cpp
     ipm/IpxWrapper.cpp
     lp_data/Highs.cpp
     lp_data/HighsCallback.cpp
@@ -440,10 +440,6 @@ set(highs_sources
 
 # add catch header?
 set(highs_headers
-    ../extern/filereaderlp/builder.hpp
-    ../extern/filereaderlp/def.hpp
-    ../extern/filereaderlp/model.hpp
-    ../extern/filereaderlp/reader.hpp
     ../extern/pdqsort/pdqsort.h
     ../extern/zstr/strict_fstream.hpp
     ../extern/zstr/zstr.hpp
@@ -456,6 +452,10 @@ set(highs_headers
     io/HMpsFF.h
     io/HMPSIO.h
     io/LoadOptions.h
+    io/filereaderlp/builder.hpp
+    io/filereaderlp/def.hpp
+    io/filereaderlp/model.hpp
+    io/filereaderlp/reader.hpp
     ipm/IpxSolution.h
     ipm/IpxWrapper.h
     lp_data/HConst.h

highs/io/FilereaderLp.cpp

@@ -16,7 +16,7 @@
 #include <exception>
 #include <map>
 
-#include "../extern/filereaderlp/reader.hpp"
+#include "io/filereaderlp/reader.hpp"
 #include "lp_data/HighsLpUtils.h"
 
 FilereaderRetcode FilereaderLp::readModelFromFile(const HighsOptions& options,
@@ -290,7 +290,7 @@ FilereaderRetcode FilereaderLp::readModelFromFile(const HighsOptions& options,
                    sum_num_zero > 1 ? "s" : "");
 
   } catch (std::invalid_argument& ex) {
-    // lpassert in extern/filereaderlp/def.hpp throws
+    // lpassert in highs/io/filereaderlp/def.hpp throws
     // std::invalid_argument whatever the error. Hence, unless
     // something is done specially - here or elsewhere -
     // FilereaderRetcode::kParserError will be returned.

extern/filereaderlp/LICENSE highs/io/filereaderlp/LICENSEextern/filereaderlp/LICENSE renamed to highs/io/filereaderlp/LICENSE

@@ -5,7 +5,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "model.hpp"
+#include "io/filereaderlp/model.hpp"
 
 struct Builder {
   std::unordered_map<std::string, std::shared_ptr<Variable>> variables;

extern/filereaderlp/builder.hpp highs/io/filereaderlp/builder.hppextern/filereaderlp/builder.hpp renamed to highs/io/filereaderlp/builder.hpp

@@ -1,4 +1,4 @@
-#include "reader.hpp"
+#include "io/filereaderlp/reader.hpp"
 
 #include <algorithm>
 #include <array>

extern/filereaderlp/def.hpp highs/io/filereaderlp/def.hppextern/filereaderlp/def.hpp renamed to highs/io/filereaderlp/def.hpp

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "model.hpp"
+#include "io/filereaderlp/model.hpp"
 
 Model readinstance(std::string filename);