Merge branch 'chimera_CI' into 'staging'

Chimera ci

See merge request !139

.gitlab-ci.yml

@@ -142,6 +142,24 @@ make:knl:
       - config.log
       - tests/*.log
 
+make:chimera:
+  stage: build
+  except:
+    - /^wip.*/
+    - /^WIP.*/
+  tags:
+    - cuda
+  script:
+    - ./autogen.sh
+    - mkdir build
+    - ./configure --prefix=`pwd`/build --with-cuda=yes
+    - make -j check
+  artifacts:
+    when: on_failure
+    paths:
+      - config.log
+      - tests/*.log
+
 readthedocs:
   stage: docs
   when: on_success

benchmarks/Makefile.am

@@ -8,6 +8,13 @@ AM_CFLAGS += $(HWLOC_CFLAGS)
 AM_LDFLAGS += $(HWLOC_LIBS)
 endif
 
+if HAVE_CUDA
+LIBS += $(CUDA_CFLAGS)
+LIBS += $(CUDA_LIBS)
+AM_CFLAGS += $(CUDA_CFLAGS)
+AM_LDFLAGS += $(CUDA_LIBS)
+endif
+
 noinst_LIBRARIES = libkernel.a
 libkernel_a_SOURCES = utils.c utils.h blas_l1_kernel.c blas_l1_kernel.h verify_blas_l1.c verify_blas_l1.h
 LDADD = libkernel.a