.github/workflows/main.yml

@@ -3,16 +3,16 @@ name: CI
 
 on:
   push:
-    branches: [ master, cuda ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, cuda ]
+    branches: [ master ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      WITH_CURRENT_SHELL: "nix-shell --argstr compiler ${{matrix.compiler}} --arg cuda ${{matrix.cuda}} --run"
+      WITH_CURRENT_SHELL: "nix-shell --argstr compiler ${{matrix.compiler}} --run"
-      WITH_SHELL: "nix-shell ../../shell.nix --argstr compiler ${{matrix.compiler}} --arg cuda ${{matrix.cuda}} --run"
+      WITH_SHELL: "nix-shell ../../shell.nix --argstr compiler ${{matrix.compiler}} --run"
 
 
     strategy:
@@ -33,9 +33,6 @@ jobs:
           - clang7
           - clang6
           - clang5
-        cuda:
-          - false
-          - true
 
     steps:
     - uses: actions/checkout@v2.3.4

bench/test-cublas-parallel-atrip.cxx

@@ -137,7 +137,7 @@ int main(int  argc, char** argv) {
   printf("no: %ld\n", no);
   printf("nv: %ld\n", nv);
   printf("SIZE %f GB\n", (3 * nv * oo
-                          + 6 * no * nv
+                          + 6 * oo * nv
                           + 3 * oo
                           + 3 * ooo
                           + 1 * ooo

etc/make/ctf.mk

@@ -14,17 +14,10 @@ $(CTF_SRC_PATH)/configure:
 	git clone $(CTF_GIT_REPOSITORY) $(@D)
 	cd $(@D) && git checkout $(CTF_COMMIT)
 
-# Here make sure that ctf does not builld with CUDA support
-# since it is broken anyways
-# 
-# Also we patch the file kernel.h because it mostl
-# doesn't work when we try to include ctf in a CUDACC
-# compiler code.
 $(CTF_BUILD_PATH)/Makefile: $(CTF_SRC_PATH)/configure
 	mkdir -p $(CTF_BUILD_PATH)
 	cd $(CTF_BUILD_PATH) && \
-		$(abspath $(CTF_SRC_PATH))/configure NVCC="" $(CTF_CONFIG_FLAGS)
+		$(abspath $(CTF_SRC_PATH))/configure $(CTF_CONFIG_FLAGS)
-	sed -i s/CUDACC/ATRIP_NOT_CUDACC/g ${CTF_SRC_PATH}/src/interface/kernel.h
 
 
 $(CTF_STATIC_LIB): $(CTF_BUILD_PATH)/Makefile