From 7ce3005d27cfa68d6ed1fea001eb22cf0da628c2 Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Wed, 6 Jul 2016 16:52:35 -0700 Subject: pull torque queue manger setup for github/travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 18fcd7a..525fa4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ dist: trusty before_install: + - git clone https://github.com/gpgpu-sim/setup_torque_on_ubuntu_14.04.git + - ./setup_torque_on_ubuntu_14.04/install_torque.sh - wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_7.5-18_amd64.deb - sudo dpkg -i cuda-repo-ubuntu1404_7.5-18_amd64.deb - sudo apt-get -qq update -- cgit v1.3 From 7758943c96d22cd65f3de30b36c71b27370de5ce Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Wed, 6 Jul 2016 17:03:58 -0700 Subject: dependencies and directory --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 525fa4a..0564709 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ dist: trusty -before_install: +before_install: + - sudo apt-get install -y libssl-dev libxml2-dev libboost-all-dev - git clone https://github.com/gpgpu-sim/setup_torque_on_ubuntu_14.04.git - - ./setup_torque_on_ubuntu_14.04/install_torque.sh + - cd ./setup_torque_on_ubuntu_14.04; ./install_torque.sh; cd - - wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_7.5-18_amd64.deb - sudo dpkg -i cuda-repo-ubuntu1404_7.5-18_amd64.deb - sudo apt-get -qq update -- cgit v1.3 From c9cc4281bf84ad6cff77d20389b59d14a534ad6b Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Wed, 28 Mar 2018 16:16:38 -0700 Subject: (attempt to) fix compile error in last checkin --- libcuda/cuda_runtime_api.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libcuda/cuda_runtime_api.cc b/libcuda/cuda_runtime_api.cc index b7f25bf..9bdb993 100644 --- a/libcuda/cuda_runtime_api.cc +++ b/libcuda/cuda_runtime_api.cc @@ -1856,11 +1856,12 @@ void** CUDARTAPI __cudaRegisterFatBinary( void *fatCubin ) } return (void**)fat_cubin_handle; } - #endif +#else else { printf("ERROR ** __cudaRegisterFatBinary() needs to be updated\n"); abort(); } +#endif } void __cudaUnregisterFatBinary(void **fatCubinHandle) -- cgit v1.3