[med-svn] [libhmsbeagle] 02/04: New upstream version 2.1.2+20160831
Andreas Tille
tille at debian.org
Fri Sep 9 18:32:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository libhmsbeagle.
commit d6d8a42e42d98a145d4a7a8eb89dee0b5955633e
Author: Andreas Tille <tille at debian.org>
Date: Fri Sep 9 15:05:12 2016 +0200
New upstream version 2.1.2+20160831
---
.travis.yml | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
.travis/amd_sdk.sh | 45 ++++++++++++++++++++++++++++++++++
m4/ax_openmp.m4 | 34 +++++++++-----------------
3 files changed, 129 insertions(+), 22 deletions(-)
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..7d08489
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,72 @@
+# Enable C++ support
+language: cpp
+
+# Compiler selection
+matrix:
+ include:
+ - compiler: gcc
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gdb
+ - apport
+
+#cache:
+# directories:
+# - ${OPENCL_ROOT}
+
+before_install:
+ - |
+ if [[ "linux" == "linux" ]]; then
+ mkdir -p ${OPENCL_ROOT}
+ bash .travis/amd_sdk.sh ${AMDAPPSDK_VERSION}
+ tar -xjf AMD-SDK.tar.bz2
+ export OPENCL_VENDOR_PATH=${AMDAPPSDKROOT}/etc/OpenCL/vendors
+ mkdir -p ${OPENCL_VENDOR_PATH}
+ sh AMD-APP-SDK*.sh --tar -xf -C ${AMDAPPSDKROOT}
+ echo libamdocl64.so > ${OPENCL_VENDOR_PATH}/amdocl64.icd
+ export LD_LIBRARY_PATH=${AMDAPPSDKROOT}/lib/x86_64:${LD_LIBRARY_PATH}
+ export CMAKE_LIBRARY_PATH=${AMDAPPSDKROOT}/lib/x86_64;
+ chmod +x ${AMDAPPSDKROOT}/bin/x86_64/clinfo
+ ${AMDAPPSDKROOT}/bin/x86_64/clinfo
+ rm AMD-APP-SDK*.sh
+ rm AMD-SDK.tar.bz2
+ fi
+
+install:
+ - export CPLUS_INCLUDE_PATH=${AMDAPPSDKROOT}/include
+ - export LD_LIBRARY_PATH=${AMDAPPSDKROOT}/lib/x86_64:${LD_LIBRARY_PATH}
+ - export LIBRARY_PATH=${AMDAPPSDKROOT}/lib/x86_64:${LIBRARY_PATH}
+
+before_script:
+ - ulimit -c unlimited -S # Enable core dumps
+
+# Build steps
+script:
+ - ./autogen.sh
+ - ./configure --with-opencl=${AMDAPPSDKROOT}
+ - make
+ - make check
+
+# after_failure:
+# - ls
+# - COREFILE=$(find . -maxdepth 1 -name "core*" | head -n 1) # find core file
+# - if [[ -f "$COREFILE" ]]; then gdb -c "$COREFILE" ./benchmark -ex "thread apply all bt" -ex "set pagination 0" -batch; fi
+
+notifications:
+ recipients:
+ - msuchard at gmail.com
+ - daniel at kotim.me
+ email:
+ on_success: change
+ on_failure: always
+
+env:
+ global:
+ - OPENCL_ROOT=$HOME/opencl
+ - OPENCL_LIB=amdappsdk
+ - OPENCL_VERSION="12"
+ - AMDAPPSDK_VERSION=291 # OpenCL 1.2
+ - AMDAPPSDKROOT=${OPENCL_ROOT}/AMDAPPSDK
diff --git a/.travis/amd_sdk.sh b/.travis/amd_sdk.sh
new file mode 100644
index 0000000..abbce76
--- /dev/null
+++ b/.travis/amd_sdk.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Original script from https://github.com/gregvw/amd_sdk/
+
+# Location from which get nonce and file name from
+URL="http://developer.amd.com/tools-and-sdks/opencl-zone/opencl-tools-sdks/amd-accelerated-parallel-processing-app-sdk/"
+URLDOWN="http://developer.amd.com/amd-license-agreement-appsdk/"
+
+NONCE1_STRING='name="amd_developer_central_downloads_page_nonce"'
+FILE_STRING='name="f"'
+POSTID_STRING='name="post_id"'
+NONCE2_STRING='name="amd_developer_central_nonce"'
+
+#AMD APP SDK v3.0:
+if [[ $1 == "300" ]]; then
+ echo "AMD APP SDK v3.0"
+ FORM=`wget -qO - $URL | sed -n '/download-2/,/64-bit/p'`
+else
+#AMD APP SDK v2.9.1:
+ echo "AMD APP SDK v2.9.1"
+ FORM=`wget -qO - $URL | sed -n '/download-5/,/64-bit/p'`
+fi
+
+# Get nonce from form
+NONCE1=`echo $FORM | awk -F ${NONCE1_STRING} '{print $2}'`
+NONCE1=`echo $NONCE1 | awk -F'"' '{print $2}'`
+echo $NONCE1
+
+# get the postid
+POSTID=`echo $FORM | awk -F ${POSTID_STRING} '{print $2}'`
+POSTID=`echo $POSTID | awk -F'"' '{print $2}'`
+echo $POSTID
+
+# get file name
+FILE=`echo $FORM | awk -F ${FILE_STRING} '{print $2}'`
+FILE=`echo $FILE | awk -F'"' '{print $2}'`
+echo $FILE
+
+FORM=`wget -qO - $URLDOWN --post-data "amd_developer_central_downloads_page_nonce=${NONCE1}&f=${FILE}&post_id=${POSTID}"`
+
+NONCE2=`echo $FORM | awk -F ${NONCE2_STRING} '{print $2}'`
+NONCE2=`echo $NONCE2 | awk -F'"' '{print $2}'`
+echo $NONCE2
+
+wget --content-disposition --trust-server-names $URLDOWN --post-data "amd_developer_central_nonce=${NONCE2}&f=${FILE}" -O AMD-SDK.tar.bz2;
diff --git a/m4/ax_openmp.m4 b/m4/ax_openmp.m4
index 4d5d88b..8fe18c8 100644
--- a/m4/ax_openmp.m4
+++ b/m4/ax_openmp.m4
@@ -38,7 +38,6 @@
# LICENSE
#
# Copyright (c) 2008 Steven G. Johnson <stevenj at alum.mit.edu>
-# Copyright (c) 2015 John W. Peterson <jwpeterson at gmail.com>
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -66,10 +65,10 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
-#serial 11
+#serial 9
AC_DEFUN([AX_OPENMP], [
-AC_PREREQ([2.69]) dnl for _AC_LANG_PREFIX
+AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
AC_CACHE_CHECK([for OpenMP flag of _AC_LANG compiler], ax_cv_[]_AC_LANG_ABBREV[]_openmp, [save[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
ax_cv_[]_AC_LANG_ABBREV[]_openmp=unknown
@@ -84,27 +83,18 @@ for ax_openmp_flag in $ax_openmp_flags; do
none) []_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[] ;;
*) []_AC_LANG_PREFIX[]FLAGS="$save[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flag" ;;
esac
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
-@%:@include <omp.h>
+ AC_TRY_LINK([#ifdef __cplusplus
+extern "C"
+#endif
+void omp_set_num_threads(int);], [const int N = 100000;
+ int i, arr[N];
-static void
-parallel_fill(int * data, int n)
-{
- int i;
-@%:@pragma omp parallel for
- for (i = 0; i < n; ++i)
- data[i] = i;
-}
-
-int
-main()
-{
- int arr[100000];
omp_set_num_threads(2);
- parallel_fill(arr, 100000);
- return 0;
-}
-]])],[ax_cv_[]_AC_LANG_ABBREV[]_openmp=$ax_openmp_flag; break],[])
+
+ #pragma omp parallel for
+ for (i = 0; i < N; i++) {
+ arr[i] = i;
+ }], [ax_cv_[]_AC_LANG_ABBREV[]_openmp=$ax_openmp_flag; break])
done
[]_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS
])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libhmsbeagle.git
More information about the debian-med-commit
mailing list