Skip to content

Commit 6506b77

Browse files
ptalptal
committed
Turbo version 0.2!
1 parent 614cc87 commit 6506b77

22 files changed

Lines changed: 965 additions & 40 deletions

‎Makefile‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ NVCC=nvcc
1010
NVCC_FLAGS=-std=c++14 -rdc=true -arch=sm_75 -I/usr/local/cuda/include -I$(INC_DIR)
1111

1212
EXE = turbo
13+
EXE_SEQ = turbo_seq
1314

1415
# Object files:
1516
SOURCES = $(SRC_DIR)/turbo.cu $(SRC_DIR)/solver.cu
@@ -23,19 +24,21 @@ debug: $(EXE)
2324
trace: NVCC_FLAGS += -DTRACE
2425
trace: $(EXE)
2526

26-
seq: NVCC_FLAGS += -DTRACE -DSEQUENTIAL
27-
seq: $(EXE)
27+
seq: NVCC_FLAGS += -DTRACE
28+
seq: $(EXE_SEQ)
2829

29-
seq_compete: NVCC_FLAGS += -O3 -DSEQUENTIAL
30-
seq_compete: $(EXE)
30+
seq_compete: NVCC_FLAGS += -O3
31+
seq_compete: $(EXE_SEQ)
3132

3233
compete: NVCC_FLAGS += -O3
3334
compete: $(EXE)
3435

35-
# Link c++ and CUDA compiled object files to target executable:
3636
$(EXE): $(INC_ONLY) $(SOURCES)
3737
$(NVCC) $(NVCC_FLAGS) $(SOURCES) -o $@ $(LIBS)
3838

39+
$(EXE_SEQ): $(INC_ONLY) $(SOURCES)
40+
$(NVCC) -DSEQUENTIAL $(NVCC_FLAGS) $(SOURCES) -o $@ $(LIBS)
41+
3942
# Clean objects in object directory.
4043
clean:
41-
$(RM) $(EXE)
44+
$(RM) $(EXE) $(EXE_SEQ)

‎benchmarks/config.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,21 @@
2424
}>,
2525
<Solve:
2626
[[{"name": "turbo", "options": []},
27+
{"name": "turbo_seq", "options": []},
2728
{"name": "gecode", "options": []}]]
2829
>],
2930
"csv" : {
3031
"fields" : [<ProblemName>, <Nodes>, <Solutions>, <Fails>, <Time : <Sec>>, <Optimum>]
3132
},
3233
"solvers_config": [
3334
{ "name": "turbo",
34-
"version": "0.1",
35+
"version": "0.3",
3536
"exec": "/home/ptalbot/repositories/turbo/turbo",
3637
"globals": "" },
38+
{ "name": "turbo_seq",
39+
"version": "0.3",
40+
"exec": "/home/ptalbot/repositories/turbo/turbo_seq",
41+
"globals": "" },
3742
{ "name": "gecode",
3843
"version": "6.2.0",
3944
"exec": "/home/ptalbot/repositories/resources/solvers/gecode/build/bin/fzn-gecode",

‎benchmarks/database/rcpsp/patterson.rcp/gecode-6.2.0/box-min_lb-TaskRD.csv‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
problem, nodes, solutions, fails, time, optimum
2+
pat1.rcp, 42, 2, 16, 0.01s, 19
3+
pat2.rcp, 13, 2, 3, 0.00s, 7
4+
pat3.rcp, 39, 3, 13, 0.01s, 20
5+
pat4.rcp, 22, 1, 3, 0.00s, 6
6+
pat5.rcp, 22, 1, 3, 0.00s, 7
7+
pat6.rcp, 34, 1, 12, 0.01s, 8
8+
pat7.rcp, 25, 3, 9, 0.00s, 8
9+
pat8.rcp, 29, 3, 8, 0.00s, 11
10+
pat9.rcp, 78, 3, 31, 0.01s, 19
11+
pat10.rcp, 8, 1, 1, 0.00s, 14
12+
pat11.rcp, 8, 1, 1, 0.00s, 18
13+
pat12.rcp, 331893, 2, 165941, 12.62s, 13
14+
pat13.rcp, 128079, 2, 64035, 9.24s, 20
15+
pat14.rcp, 745631, 2, 372801, timeout, 43
16+
pat15.rcp, 181, 6, 65, 0.02s, 43
17+
pat16.rcp, 9478, 3, 4733, 0.33s, 32
18+
pat17.rcp, 4568, 2, 2277, 0.31s, 29
19+
pat18.rcp, 177533, 7, 88754, 6.85s, 41
20+
pat19.rcp, 177012, 2, 88500, 8.72s, 31
21+
pat20.rcp, 123, 3, 50, 0.01s, 37
22+
pat21.rcp, 778210, 3, 389091, timeout, 48
23+
pat22.rcp, 5640, 6, 2811, 0.25s, 36
24+
pat23.rcp, 532741, 5, 266364, 25.30s, 32
25+
pat24.rcp, 69, 3, 25, 0.01s, 40
26+
pat25.rcp, 34, 1, 11, 0.01s, 33
27+
pat26.rcp, 25695, 3, 12839, 1.29s, 43
28+
pat27.rcp, 69359, 5, 34671, 2.01s, 36
29+
pat28.rcp, 5662, 7, 2820, 0.41s, 43
30+
pat29.rcp, 8749, 4, 4367, 0.54s, 29
31+
pat30.rcp, 95293, 3, 47641, 3.50s, 32
32+
pat31.rcp, 336342, 1, 168169, 11.09s, 35
33+
pat32.rcp, 350, 3, 168, 0.02s, 22
34+
pat33.rcp, 47689, 5, 23838, 2.80s, 31
35+
pat34.rcp, 891866, 7, 445914, timeout, 30
36+
pat35.rcp, 3992, 5, 1987, 0.18s, 31
37+
pat36.rcp, 1439, 5, 713, 0.09s, 33
38+
pat37.rcp, 123273, 1, 61634, 4.13s, 28
39+
pat38.rcp, 4521, 3, 2252, 0.32s, 30
40+
pat39.rcp, 181, 4, 81, 0.01s, 31
41+
pat40.rcp, 14021, 4, 7001, 0.64s, 31
42+
pat41.rcp, 3416, 3, 1702, 0.13s, 36
43+
pat42.rcp, 420, 3, 204, 0.02s, 28
44+
pat43.rcp, 942731, 1, 471357, timeout, 42
45+
pat44.rcp, 126, 5, 47, 0.01s, 31
46+
pat45.rcp, 85803, 7, 42890, 3.21s, 39
47+
pat46.rcp, 9028, 3, 4503, 0.41s, 33
48+
pat47.rcp, 22605, 2, 11296, 1.17s, 35
49+
pat48.rcp, 8675, 3, 4332, 0.63s, 23
50+
pat49.rcp, 26, 1, 6, 0.01s, 18
51+
pat50.rcp, 20860, 4, 10424, 1.38s, 25
52+
pat51.rcp, 67501, 2, 33743, 4.53s, 25
53+
pat52.rcp, 176083, 3, 88031, 9.94s, 27
54+
pat53.rcp, 4511, 3, 2244, 0.30s, 28
55+
pat54.rcp, 1370556, 1, 685269, timeout, 50
56+
pat55.rcp, 264, 3, 122, 0.02s, 29
57+
pat56.rcp, 22, 1, 3, 0.01s, 27
58+
pat57.rcp, 22, 1, 3, 0.00s, 21
59+
pat58.rcp, 78267, 4, 39125, 4.29s, 35
60+
pat59.rcp, 7950, 3, 3968, 0.48s, 31
61+
pat60.rcp, 4951, 3, 2465, 0.19s, 39
62+
pat61.rcp, 51530, 3, 25756, 3.39s, 36
63+
pat62.rcp, 28469, 4, 14228, 2.04s, 37
64+
pat63.rcp, 330498, 2, 165245, 18.70s, 40
65+
pat64.rcp, 281538, 6, 140759, 14.40s, 37
66+
pat65.rcp, 51901, 3, 25942, 3.04s, 40
67+
pat66.rcp, 527, 2, 256, 0.03s, 38
68+
pat67.rcp, 39778, 4, 19879, 2.32s, 27
69+
pat68.rcp, 427, 4, 198, 0.03s, 41
70+
pat69.rcp, 97225, 1, 48610, 4.69s, 30
71+
pat70.rcp, 132, 5, 57, 0.02s, 31
72+
pat71.rcp, 2012, 4, 998, 0.15s, 32
73+
pat72.rcp, 562744, 2, 281360, timeout, 42
74+
pat73.rcp, 38602, 6, 19288, 2.45s, 36
75+
pat74.rcp, 137, 5, 54, 0.01s, 30
76+
pat75.rcp, 38013, 2, 19004, 1.60s, 34
77+
pat76.rcp, 603735, 5, 301850, timeout, 43
78+
pat77.rcp, 495096, 4, 247534, timeout, 64
79+
pat78.rcp, 516146, 5, 258055, timeout, 53
80+
pat79.rcp, 625483, 5, 312727, timeout, 45
81+
pat80.rcp, 1646, 2, 816, 0.11s, 38
82+
pat81.rcp, 7736, 2, 3860, 0.39s, 36
83+
pat82.rcp, 149, 4, 57, 0.01s, 34
84+
pat83.rcp, 76, 2, 24, 0.01s, 34
85+
pat84.rcp, 38, 1, 11, 0.01s, 33
86+
pat85.rcp, 45, 2, 9, 0.01s, 31
87+
pat86.rcp, 45, 2, 9, 0.01s, 31
88+
pat87.rcp, 26121, 4, 13051, 1.94s, 29
89+
pat88.rcp, 610848, 2, 305412, timeout, 43
90+
pat89.rcp, 365, 3, 173, 0.02s, 31
91+
pat90.rcp, 32165, 5, 16075, 2.43s, 39
92+
pat91.rcp, 42772, 6, 21374, 2.71s, 35
93+
pat92.rcp, 5142, 5, 2556, 0.26s, 28
94+
pat93.rcp, 826, 5, 401, 0.05s, 26
95+
pat94.rcp, 125, 3, 51, 0.01s, 36
96+
pat95.rcp, 6686, 4, 3332, 0.35s, 33
97+
pat96.rcp, 1626, 3, 809, 0.09s, 26
98+
pat97.rcp, 12959, 5, 6470, 0.92s, 30
99+
pat98.rcp, 237373, 5, 118672, 17.52s, 41
100+
pat99.rcp, 623652, 2, 311814, timeout, 37
101+
pat100.rcp, 411828, 5, 205904, 22.86s, 33
102+
pat101.rcp, 47579, 5, 23773, 5.82s, 75
103+
pat102.rcp, 100, 1, 37, 0.03s, 83
104+
pat103.rcp, 57, 1, 12, 0.02s, 56
105+
pat104.rcp, 178, 2, 72, 0.04s, 79
106+
pat105.rcp, 647, 2, 312, 0.07s, 76
107+
pat106.rcp, 10064, 5, 5007, 1.45s, 60
108+
pat107.rcp, 114, 1, 49, 0.03s, 78
109+
pat108.rcp, 282, 3, 126, 0.06s, 61
110+
pat109.rcp, 318302, 4, 159132, timeout, 60
111+
pat110.rcp, 175, 3, 64, 0.03s, 50

‎benchmarks/database/rcpsp/patterson.rcp/gecode-6.2.0/box-min_lb-TaskRD.json‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"problem_set_path":
3+
"../../absolute-project/kobe-rcpsp/data/rcpsp/patterson.rcp/",
4+
"timeout": 30,
5+
"solver_instance": [
6+
"FznSolver",
7+
{
8+
"fzn": {
9+
"solver": {
10+
"name": "gecode",
11+
"version": "6.2.0",
12+
"exec":
13+
"/home/ptalbot/repositories/resources/solvers/gecode/build/bin/fzn-gecode",
14+
"globals":
15+
"/home/ptalbot/repositories/resources/solvers/gecode/gecode/flatzinc/mznlib"
16+
},
17+
"mzn2fzn": {
18+
"name": "mzn2fzn",
19+
"version": "2.3.1",
20+
"exec": "minizinc",
21+
"globals": ""
22+
},
23+
"option": "None",
24+
"strategy": {
25+
"plain": "smallest, indomain_min, complete",
26+
"short": "min_lb"
27+
}
28+
},
29+
"decompositions": [
30+
{
31+
"name": "TaskRD",
32+
"description": "Task-resource decomposition of cumulative"
33+
}
34+
]
35+
}
36+
],
37+
"csv": {
38+
"fields": [
39+
"ProblemName",
40+
"Nodes",
41+
"Solutions",
42+
"Fails",
43+
[ "Time", "Sec" ],
44+
"Optimum"
45+
]
46+
}
47+
}

‎benchmarks/database/rcpsp/patterson.rcp/gecode-6.2.0/box-min_lb-TimeRD.csv‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
problem, nodes, solutions, fails, time, optimum
2+
pat1.rcp, 25, 2, 6, 0.01s, 19
3+
pat2.rcp, 13, 2, 3, 0.00s, 7
4+
pat3.rcp, 30, 3, 8, 0.01s, 20
5+
pat4.rcp, 22, 1, 3, 0.00s, 6
6+
pat5.rcp, 22, 1, 3, 0.01s, 7
7+
pat6.rcp, 34, 1, 12, 0.01s, 8
8+
pat7.rcp, 17, 3, 5, 0.00s, 8
9+
pat8.rcp, 28, 3, 8, 0.00s, 11
10+
pat9.rcp, 36, 3, 8, 0.01s, 19
11+
pat10.rcp, 8, 1, 1, 0.00s, 14
12+
pat11.rcp, 8, 1, 1, 0.00s, 18
13+
pat12.rcp, 99715, 2, 49852, 1.63s, 13
14+
pat13.rcp, 30374, 2, 15182, 2.50s, 20

‎benchmarks/database/rcpsp/patterson.rcp/gecode-6.2.0/box-min_lb-TimeRD.json‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"problem_set_path":
3+
"../../absolute-project/kobe-rcpsp/data/rcpsp/patterson.rcp/",
4+
"timeout": 30,
5+
"solver_instance": [
6+
"FznSolver",
7+
{
8+
"fzn": {
9+
"solver": {
10+
"name": "gecode",
11+
"version": "6.2.0",
12+
"exec":
13+
"/home/ptalbot/repositories/resources/solvers/gecode/build/bin/fzn-gecode",
14+
"globals":
15+
"/home/ptalbot/repositories/resources/solvers/gecode/gecode/flatzinc/mznlib"
16+
},
17+
"mzn2fzn": {
18+
"name": "mzn2fzn",
19+
"version": "2.3.1",
20+
"exec": "minizinc",
21+
"globals": ""
22+
},
23+
"option": "None",
24+
"strategy": {
25+
"plain": "smallest, indomain_min, complete",
26+
"short": "min_lb"
27+
}
28+
},
29+
"decompositions": [
30+
{
31+
"name": "TimeRD",
32+
"description": "Time-resource decomposition of cumulative"
33+
}
34+
]
35+
}
36+
],
37+
"csv": {
38+
"fields": [
39+
"ProblemName",
40+
"Nodes",
41+
"Solutions",
42+
"Fails",
43+
[ "Time", "Sec" ],
44+
"Optimum"
45+
]
46+
}
47+
}

‎benchmarks/database/rcpsp/patterson.rcp/optimum/optimum.csv‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
problem,optimum
2+
pat1.rcp,19
3+
pat2.rcp,7
4+
pat3.rcp,20
5+
pat4.rcp,6
6+
pat5.rcp,7
7+
pat6.rcp,8
8+
pat7.rcp,8
9+
pat8.rcp,11
10+
pat9.rcp,19
11+
pat10.rcp,14
12+
pat11.rcp,18
13+
pat12.rcp,13
14+
pat13.rcp,20
15+
pat14.rcp,43
16+
pat15.rcp,43
17+
pat16.rcp,32
18+
pat17.rcp,29
19+
pat18.rcp,41
20+
pat19.rcp,31
21+
pat20.rcp,37
22+
pat21.rcp,48
23+
pat22.rcp,36
24+
pat23.rcp,32
25+
pat24.rcp,40
26+
pat25.rcp,33
27+
pat26.rcp,43
28+
pat27.rcp,36
29+
pat28.rcp,43
30+
pat29.rcp,29
31+
pat30.rcp,32
32+
pat31.rcp,35
33+
pat32.rcp,22
34+
pat33.rcp,31
35+
pat34.rcp,30
36+
pat35.rcp,31
37+
pat36.rcp,33
38+
pat37.rcp,28
39+
pat38.rcp,30
40+
pat39.rcp,31
41+
pat40.rcp,31
42+
pat41.rcp,36
43+
pat42.rcp,28
44+
pat43.rcp,41
45+
pat44.rcp,31
46+
pat45.rcp,39
47+
pat46.rcp,33
48+
pat47.rcp,35
49+
pat48.rcp,23
50+
pat49.rcp,18
51+
pat50.rcp,25
52+
pat51.rcp,25
53+
pat52.rcp,27
54+
pat53.rcp,28
55+
pat54.rcp,50
56+
pat55.rcp,29
57+
pat56.rcp,27
58+
pat57.rcp,21
59+
pat58.rcp,35
60+
pat59.rcp,31
61+
pat60.rcp,39
62+
pat61.rcp,36
63+
pat62.rcp,37
64+
pat63.rcp,40
65+
pat64.rcp,37
66+
pat65.rcp,40
67+
pat66.rcp,38
68+
pat67.rcp,27
69+
pat68.rcp,41
70+
pat69.rcp,30
71+
pat70.rcp,31
72+
pat71.rcp,32
73+
pat72.rcp,41
74+
pat73.rcp,36
75+
pat74.rcp,30
76+
pat75.rcp,34
77+
pat76.rcp,43
78+
pat77.rcp,64
79+
pat78.rcp,53
80+
pat79.rcp,45
81+
pat80.rcp,38
82+
pat81.rcp,36
83+
pat82.rcp,34
84+
pat83.rcp,34
85+
pat84.rcp,33
86+
pat85.rcp,31
87+
pat86.rcp,31
88+
pat87.rcp,29
89+
pat88.rcp,40
90+
pat89.rcp,31
91+
pat90.rcp,39
92+
pat91.rcp,35
93+
pat92.rcp,28
94+
pat93.rcp,26
95+
pat94.rcp,36
96+
pat95.rcp,33
97+
pat96.rcp,26
98+
pat97.rcp,30
99+
pat98.rcp,41
100+
pat99.rcp,37
101+
pat100.rcp,33
102+
pat101.rcp,75
103+
pat102.rcp,83
104+
pat103.rcp,56
105+
pat104.rcp,79
106+
pat105.rcp,76
107+
pat106.rcp,60
108+
pat107.rcp,78
109+
pat108.rcp,61
110+
pat109.rcp,60
111+
pat110.rcp,50

0 commit comments

Comments
 (0)