Merge pull request #1289 from NVIDIA/release/26.06

Forward-merge release/26.06 into main

Author: GPUtester

benchmarks/linear_programming/cuopt/benchmark_helper.hpp

@@ -275,7 +275,7 @@ void mps_file_to_binary(const std::filesystem::path& filename)
   std::string p = std::string(filename);
 
   cuopt::linear_programming::io::mps_data_model_t<int, double> op_problem =
-    cuopt::linear_programming::io::parse_mps<int, double>(p);
+    cuopt::linear_programming::io::read_mps<int, double>(p);
 
   auto filename_string = filename.filename().string();
 

benchmarks/linear_programming/cuopt/run_mip.cpp

@@ -172,7 +172,7 @@ int run_single_file(std::string file_path,
     CUOPT_LOG_INFO("running file %s on gpu : %d", base_filename.c_str(), device);
     try {
       mps_data_model =
-        cuopt::linear_programming::io::parse_mps<int, double>(file_path, input_mps_strict);
+        cuopt::linear_programming::io::read_mps<int, double>(file_path, input_mps_strict);
     } catch (const std::logic_error& e) {
       CUOPT_LOG_ERROR("MPS parser execption: %s", e.what());
       parsing_failed = true;

benchmarks/linear_programming/cuopt/run_pdlp.cu

@@ -149,7 +149,7 @@ static int run_solver(const argparse::ArgumentParser& program, const raft::handl
 
   // Parse MPS file
   cuopt::linear_programming::io::mps_data_model_t<int, double> op_problem =
-    cuopt::linear_programming::io::parse_mps<int, double>(program.get<std::string>("--path"));
+    cuopt::linear_programming::io::read_mps<int, double>(program.get<std::string>("--path"));
 
   // Solve LP problem
   bool problem_checking = true;

ci/test_self_hosted_service.sh

@@ -113,14 +113,29 @@ if [ "$doservertest" -eq 1 ]; then
     # Success, small MILP problem with pure JSON which returns a solution with Optimal status
     run_cli_test "'status': 'Optimal'" cuopt_sh -s -c $CLIENT_CERT -p $CUOPT_SERVER_PORT -t LP ../../datasets/mixed_integer_programming/milp_data.json
 
-    # Succes, small LP problem with mps. Data will be transformed to JSON
+    # Success, small LP problem with MPS. Data will be transformed to JSON
     run_cli_test "'status': 'Optimal'" cuopt_sh -s -c "$CLIENT_CERT" -p $CUOPT_SERVER_PORT -t LP ../../datasets/linear_programming/good-mps-1.mps
 
-    # Succes, small Batch LP problem with mps. Data will be transformed to JSON
+    # Success, small Batch LP problem with MPS. Data will be transformed to JSON
     run_cli_test "'status': 'Optimal'" cuopt_sh -s -c "$CLIENT_CERT" -p $CUOPT_SERVER_PORT -t LP ../../datasets/linear_programming/good-mps-1.mps ../../datasets/linear_programming/good-mps-1.mps
 
-    # Error, local file mode is not allowed with mps
+    # Success, small LP problem with LP format. Data will be transformed to JSON
+    run_cli_test "'status': 'Optimal'" cuopt_sh -s -c "$CLIENT_CERT" -p $CUOPT_SERVER_PORT -t LP ../../datasets/linear_programming/good-mps-1.lp
+
+    # Success, small Batch LP problem with LP format. Data will be transformed to JSON
+    run_cli_test "'status': 'Optimal'" cuopt_sh -s -c "$CLIENT_CERT" -p $CUOPT_SERVER_PORT -t LP ../../datasets/linear_programming/good-mps-1.lp ../../datasets/linear_programming/good-mps-1.lp
+
+    # Success, compressed LP inputs (.lp.gz / .lp.bz2) via Read dispatch
+    run_cli_test "'status': 'Optimal'" cuopt_sh -s -c "$CLIENT_CERT" -p $CUOPT_SERVER_PORT -t LP ../../datasets/linear_programming/good-mps-1.lp.gz
+    run_cli_test "'status': 'Optimal'" cuopt_sh -s -c "$CLIENT_CERT" -p $CUOPT_SERVER_PORT -t LP ../../datasets/linear_programming/good-mps-1.lp.bz2
+
+    # Success, compressed MPS inputs (.mps.gz / .mps.bz2) for parity
+    run_cli_test "'status': 'Optimal'" cuopt_sh -s -c "$CLIENT_CERT" -p $CUOPT_SERVER_PORT -t LP ../../datasets/linear_programming/good-mps-1.mps.gz
+    run_cli_test "'status': 'Optimal'" cuopt_sh -s -c "$CLIENT_CERT" -p $CUOPT_SERVER_PORT -t LP ../../datasets/linear_programming/good-mps-1.mps.bz2
+
+    # Error, local file mode is not allowed with MPS/LP file inputs
     run_cli_test "Cannot use local file mode with MPS/LP data" cuopt_sh -s -c "$CLIENT_CERT" -p $CUOPT_SERVER_PORT -t LP -f good-mps-1.mps
+    run_cli_test "Cannot use local file mode with MPS/LP data" cuopt_sh -s -c "$CLIENT_CERT" -p $CUOPT_SERVER_PORT -t LP -f good-mps-1.lp
 
     # Just run validator
     cp ../../datasets/cuopt_service_data/cuopt_problem_data.json "$CUOPT_DATA_DIR"

cpp/cuopt_cli.cpp

@@ -108,7 +108,7 @@ int run_single_file(const std::string& file_path,
   {
     CUOPT_LOG_INFO("Reading file %s", base_filename.c_str());
     try {
-      mps_data_model = cuopt::linear_programming::io::parse_problem<int, double>(file_path);
+      mps_data_model = cuopt::linear_programming::io::read<int, double>(file_path);
     } catch (const std::logic_error& e) {
       CUOPT_LOG_ERROR("Parser exception: %s", e.what());
       parsing_failed = true;

cpp/include/cuopt/linear_programming/io/parser.hpp

@@ -40,23 +40,23 @@ namespace cuopt::linear_programming::io {
  * @return mps_data_model_t A fully formed LP/QP problem which represents the given file
  */
 template <typename i_t, typename f_t>
-mps_data_model_t<i_t, f_t> parse_mps(const std::string& mps_file_path,
-                                     bool fixed_mps_format = false);
+mps_data_model_t<i_t, f_t> read_mps(const std::string& mps_file_path,
+                                    bool fixed_mps_format = false);
 
 /**
  * @brief Reads an MPS problem from in-memory file contents.
  *
- * This parses the same plain-text MPS format as parse_mps(), but the input is
+ * This parses the same plain-text MPS format as read_mps(), but the input is
  * already loaded in memory. Compressed .mps.gz/.mps.bz2 inputs are only supported
- * by parse_mps() because compression is detected from the file path.
+ * by read_mps() because compression is detected from the file path.
  *
  * @param[in] mps_contents MPS file contents.
  * @param[in] fixed_mps_format If MPS content should be parsed as fixed, false by default.
  * @return mps_data_model_t A fully formed problem which represents the given content.
  */
 template <typename i_t, typename f_t>
-mps_data_model_t<i_t, f_t> parse_mps_from_string(std::string_view mps_contents,
-                                                 bool fixed_mps_format = false);
+mps_data_model_t<i_t, f_t> read_mps_from_string(std::string_view mps_contents,
+                                                bool fixed_mps_format = false);
 
 /**
  * @brief Reads a linear, mixed-integer, or quadratic optimization problem from
@@ -82,62 +82,64 @@ mps_data_model_t<i_t, f_t> parse_mps_from_string(std::string_view mps_contents,
  * a ValidationError when encountered.
  *
  * Compressed inputs (.lp.gz, .lp.bz2) are supported when zlib / libbzip2
- * are installed (same dispatching as parse_mps).
+ * are installed (same dispatching as read_mps).
  *
  * @param[in] lp_file_path Path to the LP file.
  * @return mps_data_model_t A fully formed LP/MIP/QP problem representing the
  *         given file.
  */
 template <typename i_t, typename f_t>
-mps_data_model_t<i_t, f_t> parse_lp(const std::string& lp_file_path);
+mps_data_model_t<i_t, f_t> read_lp(const std::string& lp_file_path);
 
 /**
  * @brief Reads an LP, MIP, or QP problem from in-memory file contents.
  *
- * This parses the same plain-text LP format as parse_lp(), but the input is
+ * This parses the same plain-text LP format as read_lp(), but the input is
  * already loaded in memory. Compressed .lp.gz/.lp.bz2 inputs are only
- * supported by parse_lp() because compression is detected from the file
- * path. Supports the same scope as parse_lp() (LP, MIP, QP, plus
+ * supported by read_lp() because compression is detected from the file
+ * path. Supports the same scope as read_lp() (LP, MIP, QP, plus
  * semi-continuous variables).
  *
  * @param[in] lp_contents LP file contents.
  * @return mps_data_model_t A fully formed LP/MIP/QP problem representing the
  *         given content.
  */
 template <typename i_t, typename f_t>
-mps_data_model_t<i_t, f_t> parse_lp_from_string(std::string_view lp_contents);
+mps_data_model_t<i_t, f_t> read_lp_from_string(std::string_view lp_contents);
 
 /**
  * @brief Reads an optimization problem from a file, dispatching on the file
  *        extension. Extension matching is case-insensitive.
  *
  * Routing:
- *   - .mps, .mps.gz, .mps.bz2, .qps, .qps.gz, .qps.bz2 → parse_mps()
- *   - .lp,  .lp.gz,  .lp.bz2                            → parse_lp()
+ *   - .mps, .mps.gz, .mps.bz2, .qps, .qps.gz, .qps.bz2 → read_mps()
+ *   - .lp,  .lp.gz,  .lp.bz2                            → read_lp()
  *   - anything else → std::logic_error
  *
  * This is the entry point of choice for user-facing tools (CLI, C API) that
  * want both formats to "just work" without an explicit format flag.
  *
  * @param[in] path Path to the input file.
+ * @param[in] fixed_mps_format If the MPS/QPS reader should use fixed format;
+ *             ignored for LP inputs. False by default.
  * @return mps_data_model_t The parsed problem.
  */
 template <typename i_t, typename f_t>
-inline mps_data_model_t<i_t, f_t> parse_problem(const std::string& path)
+inline mps_data_model_t<i_t, f_t> read(const std::string& path, bool fixed_mps_format = false)
 {
   std::string lower(path);
   std::transform(lower.begin(), lower.end(), lower.begin(), [](unsigned char c) {
     return static_cast<char>(std::tolower(c));
   });
   if (lower.ends_with(".mps") || lower.ends_with(".mps.gz") || lower.ends_with(".mps.bz2") ||
       lower.ends_with(".qps") || lower.ends_with(".qps.gz") || lower.ends_with(".qps.bz2")) {
-    return parse_mps<i_t, f_t>(path);
+    return read_mps<i_t, f_t>(path, fixed_mps_format);
   }
   if (lower.ends_with(".lp") || lower.ends_with(".lp.gz") || lower.ends_with(".lp.bz2")) {
-    return parse_lp<i_t, f_t>(path);
+    return read_lp<i_t, f_t>(path);
   }
   throw std::logic_error(
-    "parse_problem: unrecognized input file extension. Supported (case-insensitive): "
+    "read: unrecognized input file extension. Supported (case-insensitive): "
     ".mps, .mps.gz, .mps.bz2, .qps, .qps.gz, .qps.bz2, .lp, .lp.gz, .lp.bz2. "
     "Given path: " +
     path);

cpp/include/cuopt/linear_programming/io/utilities/cython_parser.hpp

@@ -14,11 +14,11 @@
 namespace cuopt {
 namespace cython {
 
+std::unique_ptr<cuopt::linear_programming::io::mps_data_model_t<int, double>> call_read(
+  const std::string& file_path, bool fixed_mps_format);
+
 std::unique_ptr<cuopt::linear_programming::io::mps_data_model_t<int, double>> call_parse_mps(
   const std::string& mps_file_path, bool fixed_mps_format);
 
-std::unique_ptr<cuopt::linear_programming::io::mps_data_model_t<int, double>> call_parse_lp(
-  const std::string& lp_file_path);
-
 }  // namespace cython
 }  // namespace cuopt

cpp/src/io/lp_parser.cpp

@@ -199,7 +199,7 @@ template <typename i_t, typename f_t>
 class LpParseEngine {
  public:
   LpParseEngine(lp_parser_t<i_t, f_t>& out, const std::string& file);
-  // Parses `text` directly (used by parse_lp_from_string()).
+  // Parses `text` directly (used by read_lp_from_string()).
   LpParseEngine(lp_parser_t<i_t, f_t>& out, std::string_view text);
 
  private:
@@ -1546,28 +1546,28 @@ template class lp_parser_t<int, float>;
 template class lp_parser_t<int, double>;
 
 // ===========================================================================
-// Public parse_lp() / parse_lp_from_string()
+// Public read_lp() / read_lp_from_string()
 // ===========================================================================
 
 template <typename i_t, typename f_t>
-mps_data_model_t<i_t, f_t> parse_lp(const std::string& lp_file_path)
+mps_data_model_t<i_t, f_t> read_lp(const std::string& lp_file_path)
 {
   mps_data_model_t<i_t, f_t> problem;
   lp_parser_t<i_t, f_t> parser(problem, lp_file_path);
   return problem;
 }
 
 template <typename i_t, typename f_t>
-mps_data_model_t<i_t, f_t> parse_lp_from_string(std::string_view lp_contents)
+mps_data_model_t<i_t, f_t> read_lp_from_string(std::string_view lp_contents)
 {
   mps_data_model_t<i_t, f_t> problem;
   lp_parser_t<i_t, f_t> parser(problem, lp_contents);
   return problem;
 }
 
-template mps_data_model_t<int, float> parse_lp<int, float>(const std::string&);
-template mps_data_model_t<int, double> parse_lp<int, double>(const std::string&);
-template mps_data_model_t<int, float> parse_lp_from_string<int, float>(std::string_view);
-template mps_data_model_t<int, double> parse_lp_from_string<int, double>(std::string_view);
+template mps_data_model_t<int, float> read_lp<int, float>(const std::string&);
+template mps_data_model_t<int, double> read_lp<int, double>(const std::string&);
+template mps_data_model_t<int, float> read_lp_from_string<int, float>(std::string_view);
+template mps_data_model_t<int, double> read_lp_from_string<int, double>(std::string_view);
 
 }  // namespace cuopt::linear_programming::io

cpp/src/io/lp_parser.hpp

@@ -36,7 +36,7 @@ class lp_parser_t {
   lp_parser_t(mps_data_model_t<i_t, f_t>& problem, const std::string& file);
 
   // Parses `input` (LP format text already loaded in memory) and populates
-  // `problem`. Used by parse_lp_from_string() — compressed inputs are only
+  // `problem`. Used by read_lp_from_string() — compressed inputs are only
   // supported via the file-path constructor since compression is detected
   // from the path suffix.
   lp_parser_t(mps_data_model_t<i_t, f_t>& problem, std::string_view input);

cpp/src/io/parser.cpp

@@ -12,28 +12,27 @@
 namespace cuopt::linear_programming::io {
 
 template <typename i_t, typename f_t>
-mps_data_model_t<i_t, f_t> parse_mps(const std::string& mps_file, bool fixed_mps_format)
+mps_data_model_t<i_t, f_t> read_mps(const std::string& mps_file, bool fixed_mps_format)
 {
   mps_data_model_t<i_t, f_t> problem;
   mps_parser_t<i_t, f_t> parser(problem, mps_file, fixed_mps_format);
   return problem;
 }
 
 template <typename i_t, typename f_t>
-mps_data_model_t<i_t, f_t> parse_mps_from_string(std::string_view mps_contents,
-                                                 bool fixed_mps_format)
+mps_data_model_t<i_t, f_t> read_mps_from_string(std::string_view mps_contents,
+                                                bool fixed_mps_format)
 {
   mps_data_model_t<i_t, f_t> problem;
   mps_parser_t<i_t, f_t> parser(problem, mps_contents, fixed_mps_format);
   return problem;
 }
 
-template mps_data_model_t<int, float> parse_mps(const std::string& mps_file, bool fixed_mps_format);
-template mps_data_model_t<int, double> parse_mps(const std::string& mps_file,
-                                                 bool fixed_mps_format);
-template mps_data_model_t<int, float> parse_mps_from_string(std::string_view mps_contents,
+template mps_data_model_t<int, float> read_mps(const std::string& mps_file, bool fixed_mps_format);
+template mps_data_model_t<int, double> read_mps(const std::string& mps_file, bool fixed_mps_format);
+template mps_data_model_t<int, float> read_mps_from_string(std::string_view mps_contents,
+                                                           bool fixed_mps_format);
+template mps_data_model_t<int, double> read_mps_from_string(std::string_view mps_contents,
                                                             bool fixed_mps_format);
-template mps_data_model_t<int, double> parse_mps_from_string(std::string_view mps_contents,
-                                                             bool fixed_mps_format);
 
 }  // namespace cuopt::linear_programming::io