clean up and nuget failure

Author: galabovaa

CMakeLists.txt

@@ -406,7 +406,10 @@ if(NOT(${HIGHS_NO_DEFAULT_THREADS} STREQUAL "OFF"))
 endif()
 
 # For debug of cuda locally
-add_compile_options("$<$<AND:$<CONFIG:Debug,RelWithDebInfo>,$<COMPILE_LANGUAGE:CUDA>>:-G>")
+
+# does not work with older CMake 
+# add_compile_options("$<$<AND:$<CONFIG:Debug,RelWithDebInfo>,$<COMPILE_LANGUAGE:CUDA>>:-G>")
+
 # add_compile_options("$<$<COMPILE_LANGUAGE:CUDA>:-G>")
 
 if (CUPDLP_GPU AND UNIX)

cmake/python-highs.cmake

@@ -45,16 +45,6 @@ target_link_libraries(_core PRIVATE pybind11::headers)
 # sources for python 
 target_sources(_core PUBLIC ${sources_python} ${headers_python})
 
-# Cuda Python 
-# if (CUPDLP_GPU)
-#     enable_language(CXX CUDA)
-#     target_sources(_core PRIVATE ${cuda_sources_python})
-
-#     target_include_directories(_core PUBLIC "/usr/local/cuda/include")
-#     set_target_properties(_core PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
-# endif()
-
-
 # include directories for python 
 target_include_directories(_core PUBLIC ${include_dirs_python})
 

src/pdlp/CupdlpWrapper.cpp

@@ -154,9 +154,6 @@ HighsStatus solveLpCupdlp(const HighsOptions& options, HighsTimer& timer,
 
   cupdlp_float scaling_time = getTimeStamp();
 
-  // PDHG_Scale_Data(local_log_level, csc_cpu, ifScaling, scaling, cost,
-  //                        lower, upper, rhs);
-
   PDHG_Scale_Data(csc_cpu, ifScaling, scaling, cost, lower, upper, rhs);
 
   scaling_time = getTimeStamp() - scaling_time;
@@ -209,7 +206,6 @@ HighsStatus solveLpCupdlp(const HighsOptions& options, HighsTimer& timer,
       highs_solution.row_dual.data(), &value_valid, &dual_valid, ifSaveSol,
       fp_sol, constraint_new_idx, constraint_type, &pdlp_model_status,
       &pdlp_num_iter);
-
   highs_info.pdlp_iteration_count = pdlp_num_iter;
 
   model_status = HighsModelStatus::kUnknown;

src/pdlp/README.md

@@ -18,18 +18,16 @@ nvidia-smi
 
 This should print a table of GPU-related stats. If it doesn't don't worry: installing the Cuda Toolkit from https://developer.nvidia.com/cuda-toolkit should help!
 
-### Install CUDA from website
+### Install CUDA and Driver from the Nvidia website
 
-Download Cuda from https://developer.nvidia.com/cuda-toolkit for the appropriate OS and architecture.
+Download Cuda Tooklit and the Nvidia driver from https://developer.nvidia.com/cuda-toolkit for the appropriate OS and architecture.
 
 Note, that installing the `nvidia-cuda-toolkit` package from apt will work on many Linux installations, *but* if the drivers are missing and you attempt to install them with
 ```
 apt install nvidia-cuda-toolkit
 apt install nvidia-utils-515
 ```
-or `nvidia-utils-some-other-number`, this may lead to errors with versions of cuda libraries on versions of Lunux that are resolved by cleaning up the cuda drivers and toolkit from the machine and installing the toolkit from the website, which should give you the drivers as well. 
-
-If you run into any trouble, please get in touch with Ivet right away so we can look at it together. Ivet did have some trouble getting it all to work on her laptop and is still learning about supporting different versions of Cuda on different operating systems.
+or `nvidia-utils-some-other-number`, this may lead to errors with versions of cuda libraries on versions of Lunux that are resolved by cleaning up the cuda drivers and toolkit from the machine and installing again from the website. 
 
 Check again that the drivers are present by running 
 ```
@@ -44,14 +42,12 @@ nvcc --version
 
 If you see a version, this means that the cuda compiler nvcc is up and running.
 
-When both work, you should check that `/usr/local/cuda` exists. 
+When both work, on Linux, you should check that `/usr/local/cuda` exists. 
 
 #### Build
 
-* Checkout the HiGHS codebase from Github, and use the branch `cuda-updates`
-* From your HiGHS build directory, run
-
 ```
-cmake -DCUPDLP_GPU=ON -DALL_TESTS=ON ..; make
+cmake -S . -B build -DCUPDLP_GPU=ON -DALL_TESTS=ON ..
+cmake --build build --parallel
 ```
 

src/pdlp/cupdlp/cuda/CMakeLists.txt

@@ -18,11 +18,11 @@ target_compile_definitions(cudalin
         $<$<CONFIG:Debug>:-DCUPDLP_DEBUG=1>
 )
 
-    if (WIN32)
-      target_link_libraries(cudalin ${CUDA_LIBRARY})
-    else()
-      target_link_libraries(cudalin ${CUDA_LIBRARY} m)
-    endif()
+if (WIN32)
+  target_link_libraries(cudalin ${CUDA_LIBRARY})
+else()
+  target_link_libraries(cudalin ${CUDA_LIBRARY} m)
+endif()
 
 # add a test
 add_executable(testcudalin test_cuda_linalg.c)

src/pdlp/cupdlp/cupdlp_linalg.c

@@ -395,7 +395,7 @@ void Ax_single_gpu(CUPDLPwork *w, cusparseDnVecDescr_t vecX,
 
   switch (w->problem->data->matrix_format) {
     case CSR_CSC:
-          cuda_csr_Ax(w->cusparsehandle, w->problem->data->csr_matrix->cuda_csr,
+      cuda_csr_Ax(w->cusparsehandle, w->problem->data->csr_matrix->cuda_csr,
                   vecX, vecAx, w->dBuffer_csr_Ax, alpha, beta);
       break;
     case CSC:
@@ -427,7 +427,7 @@ void ATy_single_gpu(CUPDLPwork *w, cusparseDnVecDescr_t vecY,
 
   switch (w->problem->data->matrix_format) {
     case CSR_CSC:
-          cuda_csc_ATy(w->cusparsehandle, w->problem->data->csc_matrix->cuda_csc,
+      cuda_csc_ATy(w->cusparsehandle, w->problem->data->csc_matrix->cuda_csc,
                    vecY, vecATy, w->dBuffer_csc_ATy, alpha, beta);
       break;
     case CSC: