From 7972beb3754409db9af3c22dbbe7bd8075c09f6e Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Fri, 3 Apr 2020 15:59:18 +0200
Subject: [PATCH 1/3] Add IBM Z to Travis configuration (#42)

* Add IBM Z to Travis configuration
---
 .travis.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 2d82f8812..c875572b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,16 @@ matrix:
         - TARGET_BOX=PPC64LE_LINUX
         - BTYPE="BINARY=64 USE_OPENMP=1"
 
+    - <<: *test-ubuntu
+      os: linux
+      arch: s390x
+      before_script:
+        - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=Z13 NUM_THREADS=32"
+      env:
+        # for matrix annotation only
+        - TARGET_BOX=IBMZ_LINUX
+        - BTYPE="BINARY=64 USE_OPENMP=1"
+
     - <<: *test-ubuntu
       env:
         - TARGET_BOX=LINUX64

From a56c9ec52a25ba0d72b6cc01f6312828113efec7 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Sat, 4 Apr 2020 22:45:01 +0200
Subject: [PATCH 2/3] Revert "Add IBM Z to Travis configuration (#42)"

This reverts commit 7972beb3754409db9af3c22dbbe7bd8075c09f6e.
---
 .travis.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c875572b2..2d82f8812 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,16 +34,6 @@ matrix:
         - TARGET_BOX=PPC64LE_LINUX
         - BTYPE="BINARY=64 USE_OPENMP=1"
 
-    - <<: *test-ubuntu
-      os: linux
-      arch: s390x
-      before_script:
-        - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=Z13 NUM_THREADS=32"
-      env:
-        # for matrix annotation only
-        - TARGET_BOX=IBMZ_LINUX
-        - BTYPE="BINARY=64 USE_OPENMP=1"
-
     - <<: *test-ubuntu
       env:
         - TARGET_BOX=LINUX64

From 66f89c0aaf5f3b179baba7c974afe14291c606c5 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Fri, 10 Apr 2020 22:06:44 +0200
Subject: [PATCH 3/3] Match thread count to machine capability

---
 cpp_thread_test/dgemm_thread_safety.cpp | 6 +++++-
 cpp_thread_test/dgemv_thread_safety.cpp | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cpp_thread_test/dgemm_thread_safety.cpp b/cpp_thread_test/dgemm_thread_safety.cpp
index cecf794fa..1c5287524 100644
--- a/cpp_thread_test/dgemm_thread_safety.cpp
+++ b/cpp_thread_test/dgemm_thread_safety.cpp
@@ -12,9 +12,13 @@ void launch_cblas_dgemm(double* A, double* B, double* C, const blasint randomMat
 
 int main(int argc, char* argv[]){
 	blasint randomMatSize = 1024; //dimension of the random square matrices used
-	uint32_t numConcurrentThreads = 52; //number of concurrent calls of the functions being tested
+	uint32_t numConcurrentThreads = 96; //number of concurrent calls of the functions being tested
 	uint32_t numTestRounds = 16; //number of testing rounds before success exit
+	uint32_t maxHwThreads = omp_get_max_threads();
 	
+	if (maxHwThreads < 96)
+		numConcurrentThreads = maxHwThreads;
+
 	if (argc > 4){
 		std::cout<<"ERROR: too many arguments for thread safety tester"<<std::endl;
 		abort();
diff --git a/cpp_thread_test/dgemv_thread_safety.cpp b/cpp_thread_test/dgemv_thread_safety.cpp
index 22505d03f..5411fec29 100644
--- a/cpp_thread_test/dgemv_thread_safety.cpp
+++ b/cpp_thread_test/dgemv_thread_safety.cpp
@@ -15,6 +15,10 @@ int main(int argc, char* argv[]){
 	blasint randomMatSize = 1024; //dimension of the random square matrices and vectors being used
 	uint32_t numConcurrentThreads = 52; //number of concurrent calls of the functions being tested
 	uint32_t numTestRounds = 16; //number of testing rounds before success exit
+	uint32_t maxHwThreads = omp_get_max_threads();
+	
+	if (maxHwThreads < 52)
+		numConcurrentThreads = maxHwThreads -4;
 	
 	if (argc > 4){
 		std::cout<<"ERROR: too many arguments for thread safety tester"<<std::endl;