Merge pull request ERGO-Code#1826 from ERGO-Code/latest

Latest for release

Author: galabovaa

.github/workflows/test-fortran-macos.yml

@@ -0,0 +1,43 @@
+name: test-fortran-macos
+
+on: [push, pull_request]
+
+jobs:
+  fast_build_release:
+    runs-on: macos-12 
+    
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: fortran-lang/[email protected]
+        id: setup-fortran
+        with:
+          compiler: gcc 
+          version: 11
+
+      # - name: Install GFortran
+      #   run: brew install gfortran gcc
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{runner.workspace}}/build
+          
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{runner.workspace}}/build
+        run: |
+          cmake --version
+          gfortran-11 --version
+          cmake $GITHUB_WORKSPACE -DFORTRAN=ON 
+
+      - name: Build
+        shell: bash
+        working-directory: ${{runner.workspace}}/build
+        run: cmake --build . --parallel
+
+      - name: Test
+        shell: bash
+        working-directory: ${{runner.workspace}}/build
+        run: |
+          ls 
+          ./bin/fortrantest

.github/workflows/test-fortran-ubuntu.yml

@@ -1,4 +1,4 @@
-name: test-fortran
+name: test-fortran-ubuntu
 
 on: [push, pull_request]
 

CMakeLists.txt

@@ -209,7 +209,7 @@ if (BUILD_CXX)
               "but it is not supported by the compiler. The check failed with this output:\n"
               "${check_ipo_support_output}")
     endif()
-  elseif(NOT ipo_supported)
+  elseif(NOT ipo_supported OR (APPLE AND FORTRAN))
     message(STATUS "IPO / LTO: disabled because it is not supported")
   elseif(NOT BUILD_SHARED_LIBS)
     # For a static library, we can't be sure whether the final linking will

FEATURES.md

@@ -1,41 +1,22 @@
 ## Build changes
 
-### HiGHS on nixpkgs
+The python wrapper highspy is now available for aarch64 on manylinux
+This allows highs to be run through Python on AWS arm64 
 
-HiGHS now has a `flake.nix` to build the binary, allowing `nix` users to try it out
-
-### Python build update
-
-Highspy with setuptools from v1.7.0 only worked on Python 3.12
-For v1.7.0 we have dropped setuptools and switched to scikit-build-core
-
-### Windows versions
-
-Fixed version info of shared library
-Added version info to executable
+Bug fix for fortran on macOS
 
 ## Code changes
 
-Inserting `pdlp_iteration_count` into various structs (for v1.7.0) breaks the C API, so it has been moved to the end of those structs
-
-`setBasis` has been added to `highspy`
-
-`writePresolvedModel` has been added
-
-Saved MIP solution pool is populated when presolve reduces MIP to empty
-
-Compilation date has been removed improve build reproducibility. Methods to print compilation dates are deprecated
-
-Logging and error return when user-supplied solution or basis is rejected on vector dimensions
-
-Memory allocation errors in presolve are caught and `Highs::run()` returns `HighsStatus::kError` with `model_status_ = HighsModelStatus::kMemoryLimit`
-
-QP solver logging is now neater and quieter
-
-Any Hessian for the incumbent model is modified with zero entries when adding columns to the model, and rows/columns are removed when columns are deleted from the model.
+The accessor function Highs_getCallbackDataOutItem in the C API means
+that `pdlp_iteration_count` can be moved back to where it was inserted
+into the `HighsCallbackDataOut` struct in v1.7.0, which broke the C
+API. This fixes #1812
 
-Minor bug fix in MIP presolve
+Some duplicate code has been eliminated from the MIP solver, and
+modifications made to eliminate compiler warnings
 
-QP solver will now hot start given a basis and solution
+Declaration of the (deprecated) method `char* highsCompilationDate()`
+has been corrected
 
+Fixed bug when describing integrality status during the human-readable solution write
 

check/CMakeLists.txt

@@ -321,4 +321,4 @@ if (NOT FAST_BUILD OR ALL_TESTS)
       endforeach(setting)
   endforeach()
 
-endif()
+endif()

check/TestHighsVersion.cpp

@@ -13,6 +13,8 @@ TEST_CASE("HighsVersion", "[highs_version]") {
   const HighsInt major = highsVersionMajor();
   const HighsInt minor = highsVersionMinor();
   const HighsInt patch = highsVersionPatch();
+  const std::string compilation = highsCompilationDate();
+  const std::string githash = std::string(highsGithash());
   std::stringstream ss;
   ss << major << "." << minor << "." << patch;
   std::string local_version = ss.str();
@@ -21,15 +23,31 @@ TEST_CASE("HighsVersion", "[highs_version]") {
     printf("HiGHS major version %d\n", int(major));
     printf("HiGHS minor version %d\n", int(minor));
     printf("HiGHS patch version %d\n", int(patch));
-    printf("HiGHS githash: %s\n", highsGithash());
-    // Compilation date is deprecated.
-    // printf("HiGHS compilation date: %s\n", highsCompilationDate());
+    printf("HiGHS githash: %s\n", githash.c_str());
+    // Compilation date is deprecated, but make sure that the
+    // deprecated method is still tested.
+    printf("HiGHS compilation date: %s\n", compilation.c_str());
     printf("HiGHS local version: %s\n", local_version.c_str());
   }
   REQUIRE(major == HIGHS_VERSION_MAJOR);
   REQUIRE(minor == HIGHS_VERSION_MINOR);
   REQUIRE(patch == HIGHS_VERSION_PATCH);
-  REQUIRE(local_version == version);
+  REQUIRE(githash == std::string(HIGHS_GITHASH));
+  REQUIRE(version == local_version);
+  // Check that the corresponding methods
+  Highs highs;
+  const std::string version0 = highs.version();
+  REQUIRE(version0 == version);
+  const HighsInt major0 = highs.versionMajor();
+  REQUIRE(major0 == major);
+  const HighsInt minor0 = highs.versionMinor();
+  REQUIRE(minor0 == minor);
+  const HighsInt patch0 = highs.versionPatch();
+  REQUIRE(patch0 == patch);
+  const std::string githash0 = highs.githash();
+  REQUIRE(githash0 == githash);
+  const std::string compilation0 = highs.compilationDate();
+  REQUIRE(compilation == compilation);
 }
 
 TEST_CASE("sizeof-highs-int", "[highs_version]") {

cmake/README.md

@@ -3,7 +3,7 @@
 | OS       | C++   | Fortran | Python   | CSharp Example | .NET |
 |:-------- | :---: | :------: | :----: | :----: | :----: |
 | Linux    | [![Status][linux_cpp_svg]][linux_cpp_link] | [![Status][linux_fortran_svg]][linux_fortran_link] | [![Status][linux_python_svg]][linux_python_link] | *(1)* | [![Status][linux_dotnet_svg]][linux_dotnet_link] |
-| MacOS    | [![Status][macos_cpp_svg]][macos_cpp_link] | *(2)* |  [![Status][macos_python_svg]][macos_python_link] | *(1)* |[![Status][macos_dotnet_svg]][macos_dotnet_link] |
+| MacOS    | [![Status][macos_cpp_svg]][macos_cpp_link] | [![Status][macos_fortran_svg]][macos_fortran_link]  |  [![Status][macos_python_svg]][macos_python_link] | *(1)* |[![Status][macos_dotnet_svg]][macos_dotnet_link] |
 | Windows  | [![Status][windows_cpp_svg]][windows_cpp_link] | *(2)* | [![Status][windows_python_svg]][windows_python_link] | [![Status][windows_csharp_svg]][windows_csharp_link] | [![Status][windows_dotnet_svg]][windows_dotnet_link] |
 
 [linux_cpp_svg]: https://github.com/ERGO-Code/HiGHS/actions/workflows/cmake-linux-cpp.yml/badge.svg

docs/src/guide/basic.md

@@ -20,14 +20,17 @@ and [classes](@ref classes-overview), and are referred to below.
 
 #### [Enums](@id guide-basic-enums)
 
-Enums are scalar identifier types that can take only a limited range of values.????
-
-#### The
-advantage using these classes is that many fewer parameters are
-needed when passing data to and from HiGHS. However, the use of
-classes is not necessary for the basic use of `highspy`. As with the
-`C` and `Fortran` interfaces, there are equivalent methods that use
-simple scalars and vectors of data.
+Enums are scalar identifier types that can take only a limited range of values.
+
+#### [Classes](@id guide-basic-classes)
+
+The advantage of using the native `C++` classes in HiGHS is that many fewer parameters are needed
+when passing data to and from HiGHS. The binding of the data members
+of these classes to `highspy` structures allows them to be used when
+calling HiGHS from Python, although they are not necessary for the
+basic use of `highspy`. As with the `C` and `Fortran` interfaces,
+there are equivalent methods that use simple scalars and vectors of
+data.
 
 ## Defining a model
 

docs/src/interfaces/python/example-py.md

@@ -210,7 +210,7 @@ print('Basis validity = ', h.basisValidityToString(info.basis_validity))
  * `changeColCost`
  * `changeColBounds`
  * `changeRowBounds`
- * `changeColsCosts`
+ * `changeColsCost`
  * `changeColsBounds`
  * `changeRowsBounds`
  * `changeCoeff`

docs/src/options/definitions.md

@@ -341,3 +341,15 @@
 - Range: [1e-12, inf]
 - Default: 0.0001
 
+## qp\_iteration\_limit
+- Iteration limit for QP solver
+- Type: integer
+- Range: {0, 2147483647}
+- Default: 2147483647
+
+## qp\_nullspace\_limit
+- Nullspace limit for QP solver
+- Type: integer
+- Range: {0, 2147483647}
+- Default: 4000
+