add times and refactor folder structure

2019-12-11 10:23:57 -05:00
parent d8806a573b
commit 395ee99c4b
19 changed files with 171 additions and 30 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-project(hpc)
-
-add_subdirectory(common)
-
-add_subdirectory(cpu-slo)
-add_subdirectory(cpu-opt)
-
-add_subdirectory(gpu-slo)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,2 +0,0 @@
-add_library(common INTERFACE)
-target_include_directories(common INTERFACE include)
--- a/cpu-opt/CMakeLists.txt
+++ b/cpu-opt/CMakeLists.txt
@@ -1,3 +0,0 @@
-set(CMAKE_CXX_FLAGS "-std=gnu++11 -fopenmp -O3")
-
-add_executable(cpu-opt main.cpp solver.hpp)
--- a/cpu-slo/CMakeLists.txt
+++ b/cpu-slo/CMakeLists.txt
@@ -1,4 +0,0 @@
-set(CMAKE_CXX_FLAGS "-std=gnu++11 -fopenmp -O3")
-
-add_executable(cpu-slo main.cpp)
-target_link_libraries(cpu-slo PRIVATE common)
--- a/gap/B7.gap
+++ b/gap/B7.gap
@@ -0,0 +1,33 @@
+f := FreeGroup( 7 );
+g := f / [ f.1^2,
+           f.2^2,
+           f.3^2,
+           f.4^2,
+           f.5^2,
+           f.6^2,
+           f.7^2,
+           ( f.1*f.2 )^4,
+           ( f.1*f.3 )^2,
+           ( f.1*f.4 )^2,
+           ( f.1*f.5 )^2,
+           ( f.1*f.6 )^2,
+           ( f.1*f.7 )^2,
+           ( f.2*f.3 )^3,
+           ( f.2*f.4 )^2,
+           ( f.2*f.5 )^2,
+           ( f.2*f.6 )^2,
+           ( f.2*f.7 )^2,
+           ( f.3*f.4 )^3,
+           ( f.3*f.5 )^2,
+           ( f.3*f.6 )^2,
+           ( f.3*f.7 )^2,
+           ( f.4*f.5 )^3,
+           ( f.4*f.6 )^2,
+           ( f.4*f.7 )^2,
+           ( f.5*f.6 )^3,
+           ( f.5*f.7 )^2,
+           ( f.6*f.7 )^3,
+         ];
+
+tab := CosetTable( g, TrivialSubgroup(g));
+time;
--- a/gap/E6.gap
+++ b/gap/E6.gap
@@ -0,0 +1,26 @@
+f := FreeGroup( 6 );
+g := f / [ f.1^2,
+           f.2^2,
+           f.3^2,
+           f.4^2,
+           f.5^2,
+           f.6^2,
+           ( f.1*f.2 )^3,
+           ( f.2*f.3 )^3,
+           ( f.3*f.4 )^3,
+           ( f.3*f.5 )^3,
+           ( f.5*f.6 )^3,
+           ( f.1*f.3 )^2,
+           ( f.1*f.4 )^2,
+           ( f.1*f.5 )^2,
+           ( f.1*f.6 )^2,
+           ( f.2*f.4 )^2,
+           ( f.2*f.5 )^2,
+           ( f.2*f.6 )^2,
+           ( f.3*f.6 )^2,
+           ( f.4*f.5 )^2,
+           ( f.4*f.6 )^2,
+         ];
+
+tab := CosetTable( g, Subgroup(g, [ ]));
+time;
--- a/gap/H4.gap
+++ b/gap/H4.gap
@@ -0,0 +1,15 @@
+f := FreeGroup( 4 );
+g := f / [ f.1^2,
+           f.2^2,
+           f.3^2,
+           f.4^2,
+           ( f.1*f.2 )^5,
+           ( f.2*f.3 )^3,
+           ( f.3*f.4 )^3,
+           ( f.1*f.3 )^2,
+           ( f.1*f.4 )^2,
+           ( f.2*f.4 )^2
+         ];
+
+tab := CosetTable( g, Subgroup(g, [ ]));
+time;
--- a/gpu-opt/CMakeLists.txt
+++ b/gpu-opt/CMakeLists.txt
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
-project(main LANGUAGES CXX CUDA)
-
-add_executable(main main.cu)
-target_compile_features(main PUBLIC cxx_std_11)
-set_target_properties(main PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
--- a/gpu-slo/CMakeLists.txt
+++ b/gpu-slo/CMakeLists.txt
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
-project(main LANGUAGES CXX CUDA)
-
-add_executable(main main.cu)
-target_compile_features(main PUBLIC cxx_std_11)
-set_target_properties(main PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
--- a/presentation.pdf
+++ b/presentation.pdf
--- a/times/cpu-opt/opt-1203214943.out
+++ b/times/cpu-opt/opt-1203214943.out
@@ -0,0 +1,20 @@
+type,arg,nrels,secs,cosets
+0,25,4,0.0465944,2500
+0,50,4,0.190362,10000
+0,75,4,0.447425,22500
+0,100,4,0.831665,40000
+0,125,4,1.40154,62500
+0,150,4,2.01948,90000
+0,175,4,2.79876,122500
+0,200,4,3.90021,160000
+0,225,4,4.976,202500
+0,250,4,5.9673,250000
+5,2,2,0.000336645,8
+5,3,3,0.000820878,48
+5,4,4,0.0066875,384
+5,5,5,0.109345,3840
+1,-1,4,0.331433,14400
+5,6,6,2.10372,46080
+2,-1,6,2.45448,51840
+5,7,7,435.912,645120
+3,-1,7,9660.55,2903040
--- a/times/cpu-opt/opt-1208164944.out
+++ b/times/cpu-opt/opt-1208164944.out
@@ -0,0 +1,20 @@
+type,arg,nrels,secs,cosets
+0,25,4,0.0358525,2500
+0,50,4,0.147207,10000
+0,75,4,0.344879,22500
+0,100,4,0.625959,40000
+0,125,4,1.07354,62500
+0,150,4,1.45295,90000
+0,175,4,2.05472,122500
+0,200,4,2.76306,160000
+0,225,4,3.55675,202500
+0,250,4,4.87641,250000
+5,2,2,0.000312613,8
+5,3,3,0.00070606,48
+5,4,4,0.00512103,384
+5,5,5,0.0630311,3840
+1,-1,4,0.235177,14400
+5,6,6,1.26288,46080
+2,-1,6,1.48957,51840
+5,7,7,148.366,645120
+3,-1,7,2938.87,2903040
--- a/times/cpu-slo/slo-1203214939.out
+++ b/times/cpu-slo/slo-1203214939.out
@@ -0,0 +1,19 @@
+type,arg,nrels,secs,cosets
+0,25,4,0.0798219,2500
+0,50,4,0.8496,10000
+0,75,4,4.13477,22500
+0,100,4,13.4385,40000
+0,125,4,33.2128,62500
+0,150,4,76.2054,90000
+0,175,4,122.955,122500
+0,200,4,331.473,160000
+0,225,4,686.004,202500
+0,250,4,1312.11,250000
+5,2,2,0.00396549,8
+5,3,3,0.00074528,48
+5,4,4,0.0119265,384
+5,5,5,0.113232,3840
+1,-1,4,0.591012,14400
+5,6,6,9.9591,46080
+2,-1,6,11.1465,51840
+5,7,7,8472.46,645120
--- a/times/gap/gap_B7.out
+++ b/times/gap/gap_B7.out
@@ -0,0 +1,14 @@
+ ┌───────┐   GAP 4.10.2 of 19-Jun-2019
+ │  GAP  │   https://www.gap-system.org
+ └───────┘   Architecture: x86_64-pc-linux-gnu-default64-kv3
+ Configuration:  gmp 6.0.0, readline
+ Loading the library and packages ...
+ Packages:   GAPDoc 1.6.2, PrimGrp 3.3.2, SmallGrp 1.3, TransGrp 2.0.4
+ Try '??help' for help. See also '?copyright', '?cite' and '?authors'
+gap> <free group on the generators [ f1, f2, f3, f4, f5, f6, f7 ]>
+gap> > > > > > > > > > > > > > > > > > > > > > > > > > > > > <fp group on the generators [ f1, f2, f3, f4, f5, f6, f7 ]>
+gap> gap> 
+gap> 14122 ms
+gap> 
+
+This is not the whole output, but the timing output is here.
--- a/times/gap/gap_E6.out
+++ b/times/gap/gap_E6.out
@@ -0,0 +1,12 @@
+ ┌───────┐   GAP 4.10.2 of 19-Jun-2019
+ │  GAP  │   https://www.gap-system.org
+ └───────┘   Architecture: x86_64-pc-linux-gnu-default64-kv3
+ Configuration:  gmp 6.0.0, readline
+ Loading the library and packages ...
+ Packages:   GAPDoc 1.6.2, PrimGrp 3.3.2, SmallGrp 1.3, TransGrp 2.0.4
+ Try '??help' for help. See also '?copyright', '?cite' and '?authors'
+gap> <free group on the generators [ f1, f2, f3, f4, f5, f6 ]>
+gap> > > > > > > > > > > > > > > > > > > > > > <fp group on the generators [ f1, f2, f3, f4, f5, f6 ]>
+gap> gap> 
+gap> 942 ms
+gap> 
--- a/times/gap/gap_H4.out
+++ b/times/gap/gap_H4.out
@@ -0,0 +1,12 @@
+ ┌───────┐   GAP 4.10.2 of 19-Jun-2019
+ │  GAP  │   https://www.gap-system.org
+ └───────┘   Architecture: x86_64-pc-linux-gnu-default64-kv3
+ Configuration:  gmp 6.0.0, readline
+ Loading the library and packages ...
+ Packages:   GAPDoc 1.6.2, PrimGrp 3.3.2, SmallGrp 1.3, TransGrp 2.0.4
+ Try '??help' for help. See also '?copyright', '?cite' and '?authors'
+gap> <free group on the generators [ f1, f2, f3, f4 ]>
+gap> > > > > > > > > > > <fp group on the generators [ f1, f2, f3, f4 ]>
+gap> gap> 
+gap> 184 ms
+gap> 
--- a/times/gpu-opt/opt.out
+++ b/times/gpu-opt/opt.out
--- a/times/gpu-slo/slo-0.out
+++ b/times/gpu-slo/slo-0.out
--- a/times/gpu-slo/slo-1.out
+++ b/times/gpu-slo/slo-1.out