From ed8a5b266cd58c5cd7c703d863281047567502a2 Mon Sep 17 00:00:00 2001
From: Ben Cumming <bcumming@cscs.ch>
Date: Fri, 15 May 2020 16:44:54 +0200
Subject: [PATCH] set the default ARB_ARCH target to native (#1039)
* Set the default ARB_ARCH target to native.
* Tweak travis config to avoid gcc 6 bug that incorrectly implies amd64 target can do avx512.
---
.travis.yml | 14 +++++++-------
CMakeLists.txt | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 31ca2dbd..16f6dc25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ matrix:
compiler: clang
######################### LINUX #########################
-## test gcc6 - single node/rank with threading backend ##
+## test gcc7 - single node/rank with threading backend ##
- name: "linux, gcc, serial, py"
os: linux
dist: bionic
@@ -63,16 +63,16 @@ matrix:
apt:
sources:
packages:
- - g++-6
+ - g++-7
- openmpi-bin
- libopenmpi-dev
env:
- - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+ - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
- BUILD_NAME=cthread-linux-gcc-py
- WITH_DISTRIBUTED=serial WITH_PYTHON=true PY=3
- compiler: gcc-6
+ compiler: gcc-7
-## test gcc6 - mpi with threading backend ##
+## test gcc7 - mpi with threading backend ##
- name: "linux, gcc, mpi, py"
os: linux
dist: bionic
@@ -84,10 +84,10 @@ matrix:
- openmpi-bin
- libopenmpi-dev
env:
- - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
+ - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
- BUILD_NAME=mpi-linux-gcc-py
- WITH_DISTRIBUTED=mpi WITH_PYTHON=true PY=3
- compiler: gcc-6
+ compiler: gcc-7
## test clang4 - single node/rank with threading backend ##
- name: "linux, clang, serial, py"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b00500ad..2b307941 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ enable_language(CXX)
# Specify target archiecture.
-set(ARB_ARCH "" CACHE STRING "Target architecture for arbor libraries")
+set(ARB_ARCH "native" CACHE STRING "Target architecture for arbor libraries")
# Perform explicit vectorization?
--
GitLab