made gpu version default

justanhduc · Sep 24, 2022 · cb900fc · cb900fc
1 parent c787e48
commit cb900fc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,12 +16,12 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            cuda: "on"
+            cuda: "off"
             cmake_args: |
-              -DTASK_SPOOLER_COMPILE_CUDA=on
+              -DTASK_SPOOLER_COMPILE_CUDA=off
 
           - os: ubuntu-22.04
-            cuda: "off"
+            cuda: "on"
             cmake_args: ""
 
       fail-fast: false
@@ -66,7 +66,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake ..
+          cmake .. -DTASK_SPOOLER_COMPILE_CUDA=off
           make 
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(Task-Spooler C)
 
 set(CMAKE_C_STANDARD 11)
 
-option(TASK_SPOOLER_COMPILE_CUDA "Compile CUDA support (NVML)" OFF)
+option(TASK_SPOOLER_COMPILE_CUDA "Compile CUDA support (NVML)" ON)
 
 # VERSIONING
 execute_process(
@@ -59,3 +59,9 @@ else(TASK_SPOOLER_COMPILE_CUDA)
   target_compile_definitions(${target} PUBLIC CPU)
 endif(TASK_SPOOLER_COMPILE_CUDA)
 
+# install
+install(CODE "execute_process(COMMAND install -c -d /usr/local/bin)")
+install(CODE "execute_process(COMMAND install -c ts /usr/local/bin)")
+install(CODE "execute_process(COMMAND ./makeman)")
+install(CODE "execute_process(COMMAND install -c -d /usr/local/share/man/man1)")
+install(CODE "execute_process(COMMAND install -c -m 644 ts.1 /usr/local/share/man/man1)")
diff --git a/INSTALL.md b/INSTALL.md
@@ -33,13 +33,9 @@ sudo make install
 or via CMake
 ```
 mkdir build && cd build
-cmake .. -DCPU=1 -DCMAKE_BUILD_TYPE=Release
+cmake .. -DTASK_SPOOLER_COMPILE_CUDA=OFF -DCMAKE_BUILD_TYPE=Release
 make
-sudo install -c -d /usr/local/bin
-sudo install -c ts /usr/local/bin
-sudo install -c -d /usr/local/share/man/man1
-./makeman
-sudo install -c -m 644 ../ts.1 /usr/local/share/man/man1
+sudo make install
 ```
 This version is more faithful to the original `ts` but with many new exciting features, 
 and is still being actively developed. 

diff --git a/install_cmake b/install_cmake
@@ -2,9 +2,5 @@
 
 rm -rf build && mkdir build && cd build || exit
 cmake -DCMAKE_BUILD_TYPE=Release ..
-make -j 3
-sudo install -c -d /usr/local/bin
-sudo install -c ts /usr/local/bin
-sudo install -c -d /usr/local/share/man/man1
-./makeman
-sudo install -c -m 644 ../ts.1 /usr/local/share/man/man1
+make
+sudo make install