Skip to content

Move filereader #2746

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

Merged
galabovaa merged 3 commits into from
Jan 16, 2026
Merged

Move filereader #2746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22ddd54
redefinition?
galabovaa Jan 12, 2026
a96b8cb
includes fixes tests and bazel
galabovaa Jan 13, 2026
e3c082a
Update THIRD_PARTY_NOTICES.md to remove filereaderlp
jajhall Jan 16, 2026
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: 2 additions & 2 deletions BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -71,8 +71,8 @@ cc_library(
"highs/mip/feasibilityjump.hh",
] + glob([
"**/*.h",
"highs/io/filereaderlp/*.hpp",
"highs/qpsolver/*.hpp",
"extern/filereaderlp/*.hpp",
"extern/zstr/*.hpp",
]),
copts = select({
Expand Down
11 changes: 0 additions & 11 deletions THIRD_PARTY_NOTICES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,6 @@ The upstream source code is available at:

CLI11 is only used to parse command line input for the HiGHS executable, so does not affect the license status of the HiGHS library or language interfaces to it.

## filereaderlp

The source code in `/extern/filereaderlp` is distributed under the [MIT license](https://opensource.org/license/MIT)
at `/extern/filereaderlp/LICENSE`.

It was originally developed by Michael Feldmeier.

The upstream source code is available at:

* https://github.com/feldmeier/FilereaderLP

## metis

The source code in `/extern/metis` is distributed under the [Apache 2.0 license](https://opensource.org/license/apache-2-0)
Expand Down
2 changes: 1 addition & 1 deletion check/TestLPFileFormat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "HCheckConfig.h"
#include "Highs.h"
#include "catch.hpp"
#include "filereaderlp/reader.hpp"
#include "io/filereaderlp/reader.hpp"

const bool dev_run = false;

Expand Down
12 changes: 6 additions & 6 deletions cmake/sources-python.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions cmake/sources.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions highs/io/FilereaderLp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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.
Expand Down
0 extern/filereaderlp/LICENSE → highs/io/filereaderlp/LICENSE
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion extern/filereaderlp/builder.hpp → highs/io/filereaderlp/builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 extern/filereaderlp/def.hpp → highs/io/filereaderlp/def.hpp
View file
Open in desktop
File renamed without changes.
0 extern/filereaderlp/model.hpp → highs/io/filereaderlp/model.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion extern/filereaderlp/reader.cpp → highs/io/filereaderlp/reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "reader.hpp"
#include "io/filereaderlp/reader.hpp"

#include <algorithm>
#include <array>
Expand Down
2 changes: 1 addition & 1 deletion extern/filereaderlp/reader.hpp → highs/io/filereaderlp/reader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <string>

#include "model.hpp"
#include "io/filereaderlp/model.hpp"

Model readinstance(std::string filename);

Expand Down
2 changes: 1 addition & 1 deletion highs/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ _ipx_srcs = [
]

_srcs = [
'../extern/filereaderlp/reader.cpp',
'io/filereaderlp/reader.cpp',
'interfaces/highs_c_api.cpp',
'io/Filereader.cpp',
'io/FilereaderEms.cpp',
Expand Down
1 change: 0 additions & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ endif
_incdirs += include_directories([
'extern/',
'extern/pdqsort/',
'extern/filereaderlp/',
])

# Optional arguments
Expand Down
Loading