From 488adf7ffc660f7ee4c7682d2b5ee79947e17d3e Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Thu, 6 Oct 2016 09:16:32 -0700 Subject: [PATCH 1/5] use most standard flags --- ref/Makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ref/Makefile b/ref/Makefile index 4f17e69..80c6317 100644 --- a/ref/Makefile +++ b/ref/Makefile @@ -32,23 +32,15 @@ #----------------------------------------------------------------------- -#CC=cc -CC=gcc +CC := cc +CFLAGS := -O2 -fopenmp +LIBS := -lm -CFLAGS = $(OPT) -#CFLAGS += -openmp -CFLAGS += -fopenmp #CFLAGS += -D_USE_PAT_API LD = $(CC) LDFLAGS = $(CFLAGS) -# Optimization -OPT = -O3 -OPT = -g - -LIBS = -lgomp -lm - include make_targets # End makefile From 1314b2dc566f3515c225f7cdf198707eed466c99 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Thu, 6 Oct 2016 09:19:13 -0700 Subject: [PATCH 2/5] add file for Travis testing --- .travis.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f88a95e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,30 @@ +language: c +sudo: false +compiler: + - gcc +#env: +#install: +#- if [ "$CC" = "gcc" ]; then export CC="gcc-4.9"; fi +addons: + apt: + sources: + - ubuntu-toolchain-r-test + #packages: + #- gcc-4.9 + #- clang +script: + - make + - ./PathFinder.x -x 1kx750.adj_list + - ./PathFinder.x -x 2kx750.adj_list + - ./PathFinder.x -x 4kx750.adj_list + - ./PathFinder.x -x 6kx750.adj_list + - ./PathFinder.x -x 8kx750.adj_list + - ./PathFinder.x -x 10kx750.adj_list +#after_failure: +# - echo "Sad panda" +notifications: + email: + recipients: + - jeff.science@gmail.com + on_success: [change] + on_failure: [always] From 03d1c86c7dda37a963c557ae3d37b4af7d8ea6e5 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Thu, 6 Oct 2016 09:26:46 -0700 Subject: [PATCH 3/5] fix paths in Travis test --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f88a95e..0745216 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,13 +13,14 @@ addons: #- gcc-4.9 #- clang script: + - cd ref/ - make - - ./PathFinder.x -x 1kx750.adj_list - - ./PathFinder.x -x 2kx750.adj_list - - ./PathFinder.x -x 4kx750.adj_list - - ./PathFinder.x -x 6kx750.adj_list - - ./PathFinder.x -x 8kx750.adj_list - - ./PathFinder.x -x 10kx750.adj_list + - ./PathFinder.x -x ../data/scaleData/1kx750.adj_list + - ./PathFinder.x -x ../data/scaleData/2kx750.adj_list + - ./PathFinder.x -x ../data/scaleData/4kx750.adj_list + - ./PathFinder.x -x ../data/scaleData/6kx750.adj_list + - ./PathFinder.x -x ../data/scaleData/8kx750.adj_list + - ./PathFinder.x -x ../data/scaleData/10kx750.adj_list #after_failure: # - echo "Sad panda" notifications: From c2b3a725e1727de7ba854d741d8b0522329ccea7 Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Thu, 6 Oct 2016 09:40:04 -0700 Subject: [PATCH 4/5] test linux and osx --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0745216..92dbfda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,9 @@ language: c sudo: false compiler: - gcc +os: + - linux + - osx #env: #install: #- if [ "$CC" = "gcc" ]; then export CC="gcc-4.9"; fi From 09a6d0ec6cedcdaf01014a36fc7f1fc82de46c9c Mon Sep 17 00:00:00 2001 From: Jeff Hammond Date: Thu, 6 Oct 2016 09:42:04 -0700 Subject: [PATCH 5/5] disable osx since openmp not supported by cc --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 92dbfda..4ae24da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ compiler: - gcc os: - linux - - osx + #- osx #env: #install: #- if [ "$CC" = "gcc" ]; then export CC="gcc-4.9"; fi