Merged latest into hi-pdlp and fixed many merge conflicts

Author: jajhall

.github/julia/build_tarballs.jl

@@ -33,7 +33,10 @@ cmake -DCMAKE_INSTALL_PREFIX=${prefix} \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=${BUILD_SHARED} \
     -DZLIB_USE_STATIC_LIBS=${BUILD_STATIC} \
-    -DFAST_BUILD=ON ..
+    -DHIPO=ON \
+    -DBLAS_LIBRARIES="${libdir}/libopenblas.${dlext}" \
+    -DMETIS_ROOT=${prefix} \
+    ..
 
 if [[ "${target}" == *-linux-* ]]; then
         make -j ${nproc}
@@ -60,6 +63,8 @@ platforms = expand_cxxstring_abis(platforms)
 dependencies = [
     Dependency("CompilerSupportLibraries_jll"),
     Dependency("Zlib_jll"),
+    Dependency("METIS_jll"),
+    Dependency("OpenBLAS32_jll"),
     HostBuildDependency(PackageSpec(; name="CMake_jll")),
 ]
 

.github/workflows/build-intel.yml

@@ -1,7 +1,6 @@
 name: build-intel
 
 on: [push, pull_request]
-# on: []
 
 jobs:
   build:

.github/workflows/build-nuget-package.yml

@@ -31,10 +31,10 @@ jobs:
         with:
           name: macos-x64
           path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
-            
-  # macos 14 is M1
-  build_macos_14:
-    runs-on: macos-14 
+
+  # Build macos arm64
+  build_macos_arm:
+    runs-on: macos-14  # macos-14 is arm64
     steps:
       - uses: actions/checkout@v4
       - name: Build HiGHS
@@ -54,14 +54,14 @@ jobs:
           name: macos-arm64
           path: ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
 
-  # Build windows 32 and linux 
+  # Build windows 32 and linux
   build_windows_32:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
       - name: Build HiGHS
         run: |
-         cmake -E make_directory ${{runner.workspace}}/build32 
+         cmake -E make_directory ${{runner.workspace}}/build32
 
       - name: Configure CMake win32
         shell: bash
@@ -142,10 +142,10 @@ jobs:
         working-directory: ${{runner.workspace}}/build
         shell: bash
         run: cmake --build . --config Release --parallel
-      
+
       - name: Display structure of downloaded files
         run: |
-          pwd 
+          pwd
           ls -R ${{runner.workspace}}/build/dotnet/Highs.Native/runtimes
 
       - name: Download runtimes macos-x64
@@ -187,7 +187,7 @@ jobs:
 
       - name: Dotnet pack
         working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
-        run: dotnet pack -c Release /p:Version=1.11.0
+        run: dotnet pack -c Release /p:Version=1.12.0
 
       - uses: actions/upload-artifact@v4
         with:
@@ -201,7 +201,7 @@ jobs:
       name: nuget
 
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    steps: 
+    steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
 
@@ -211,6 +211,6 @@ jobs:
           name: nuget
 
       - name: Dotnet push
-        run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json 
+        run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json
       #     env:
       #       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}