Skip to content

Commit 82a11ff

Browse files
committed
add launchKernelUpdateX
1 parent cf5b809 commit 82a11ff

File tree

11 files changed

+428
-80
lines changed

11 files changed

+428
-80
lines changed

check/TestPdlp.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,10 @@ TEST_CASE("hi-pdlp", "[pdlp]") {
352352
h.setOptionValue("kkt_tolerance", kkt_tolerance);
353353
h.setOptionValue("presolve", "off");
354354

355-
HighsInt pdlp_features_off = //0
356-
// kPdlpScalingOff +
357-
// kPdlpRestartOff
358-
kPdlpAdaptiveStepSizeOff
355+
HighsInt pdlp_features_off = 0 +
356+
kPdlpScalingOff +
357+
kPdlpRestartOff +
358+
kPdlpAdaptiveStepSizeOff
359359
;
360360
h.setOptionValue("pdlp_features_off", pdlp_features_off);
361361

check/instances/2times2.mps

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
NAME: DEBUG_2X2
2+
3+
NAME DEBUG_2X2
4+
ROWS
5+
N OBJ
6+
L R1
7+
G R2
8+
COLUMNS
9+
x1 OBJ 2.0
10+
x1 R1 1.0
11+
x1 R2 3.0
12+
x2 OBJ 3.0
13+
x2 R1 2.0
14+
x2 R2 1.0
15+
RHS
16+
RHS1 R1 10.0
17+
RHS1 R2 5.0
18+
BOUNDS
19+
LO BND1 x1 0.0
20+
LO BND1 x2 0.0
21+
ENDATA

check/instances/2times3.mps

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
NAME DEBUG_2X3
2+
ROWS
3+
N OBJ
4+
L R1
5+
G R2
6+
COLUMNS
7+
x1 OBJ 1.0
8+
x1 R1 1.0
9+
x1 R2 2.0
10+
x2 OBJ 2.0
11+
x2 R1 1.0
12+
x3 OBJ 3.0
13+
x3 R2 1.0
14+
RHS
15+
RHS1 R1 20.0
16+
RHS1 R2 10.0
17+
BOUNDS
18+
LO BND1 x1 0.0
19+
LO BND1 x2 0.0
20+
LO BND1 x3 0.0
21+
ENDATA

check/instances/3times2.mps

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
NAME DEBUG_3X2
2+
ROWS
3+
N OBJ
4+
L R1
5+
G R2
6+
L R3
7+
COLUMNS
8+
x1 OBJ 4.0
9+
x1 R1 1.0
10+
x1 R2 2.0
11+
x1 R3 1.0
12+
x2 OBJ 1.0
13+
x2 R1 5.0
14+
x2 R2 1.0
15+
x2 R3 1.0
16+
RHS
17+
RHS1 R1 50.0
18+
RHS1 R2 15.0
19+
RHS1 R3 30.0
20+
BOUNDS
21+
LO BND1 x1 0.0
22+
LO BND1 x2 0.0
23+
ENDATA

highs/pdlp/cupdlp/cuda/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ add_library(cudalin SHARED
55
${CUPDLP_INCLUDE_DIR}/cuda/cupdlp_cuda_kernels.cuh
66
${CUPDLP_INCLUDE_DIR}/cuda/cupdlp_cudalinalg.cuh
77
${CUPDLP_INCLUDE_DIR}/cuda/cupdlp_cudalinalg.cu
8+
../../hipdlp/pdhg.cu
89
)
910
set_target_properties(cudalin PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
1011

@@ -34,3 +35,7 @@ target_link_libraries(testcudalin PRIVATE cudalin ${CUDA_LIBRARY})
3435
set_target_properties(testcublas PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
3536
target_link_libraries(testcublas PRIVATE cudalin ${CUDA_LIBRARY})
3637

38+
target_include_directories(cudalin PUBLIC
39+
"$<BUILD_INTERFACE:${CMAKE_CUDA_PATH}/include>"
40+
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../hipdlp>" # Add this for pdhg_kernels.hpp
41+
)

highs/pdlp/hipdlp/Meld

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ meld logger.hpp $CU_PDLP_CPP_ROOT/include/logger.hpp
55
meld logger.cc $CU_PDLP_CPP_ROOT/src/logger.cc
66
meld pdhg.hpp $CU_PDLP_CPP_ROOT/include/pdhg.hpp
77
meld pdhg.cc $CU_PDLP_CPP_ROOT/src/pdhg.cc
8+
meld pdhg.cu $CU_PDLP_CPP_ROOT/src/pdhg.cu
89
meld restart.hpp $CU_PDLP_CPP_ROOT/include/restart.hpp
910
meld restart.cc $CU_PDLP_CPP_ROOT/src/restart.cc
1011
meld scaling.hpp $CU_PDLP_CPP_ROOT/include/scaling.hpp
1112
meld scaling.cc $CU_PDLP_CPP_ROOT/src/scaling.cc
12-
meld solver_results.hpp $CU_PDLP_CPP_ROOT/include/solver_results.hpp
13+
meld solver_results.hpp $CU_PDLP_CPP_ROOT/include/solver_results.hpp
14+
meld pdhg_kernels.h $CU_PDLP_CPP_ROOT/src/pdhg_kernels.h

0 commit comments

Comments
 (0)