We do not depend on CUDA any longer, so get rid of it :)

diff --git a/docs/changes.txt b/docs/changes.txt
index ca5a265..c6abd6c 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -3,7 +3,7 @@
 Type.: Feature
 File.: Kernel
 Desc.: For NVidia, dropped CUDA support and switched to OpenCL
-Issue: 1
+Issue: 3
 
 Type.: Feature
 File.: Host

diff --git a/extra/tab_completion/install b/extra/tab_completion/install
index d757f51..d067102 100755 (executable)
--- a/extra/tab_completion/install
+++ b/extra/tab_completion/install
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Programmable bash completion for oclHashcat / cudaHashcat
+# Programmable bash completion for oclHashcat
 # this script was tested under ubuntu, please verify if on your
 # distro /etc/bash_completion.d/ exists (otherwise it won't work)
 

diff --git a/extra/tab_completion/oclHashcat64.sh b/extra/tab_completion/oclHashcat64.sh
index b675861..4672877 100644 (file)
--- a/extra/tab_completion/oclHashcat64.sh
+++ b/extra/tab_completion/oclHashcat64.sh
@@ -742,4 +742,4 @@ _oclHashcat ()
     esac
 }
 
-complete -F _oclHashcat -o filenames ${OCLHASHCAT_ROOT}/oclHashcat64.bin "${OCLHASHCAT_ROOT}"/oclHashcat32.bin "${OCLHASHCAT_ROOT}"/cudaHashcat64.bin "${OCLHASHCAT_ROOT}"/cudaHashcat32.bin
+complete -F _oclHashcat -o filenames "${OCLHASHCAT_ROOT}"/oclHashcat64.bin "${OCLHASHCAT_ROOT}"/oclHashcat32.bin

diff --git a/src/Makefile b/src/Makefile
index 613d19b..7c789f3 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -36,9 +36,8 @@ DOCUMENT_FOLDER          ?= /opt/test/usr/share/doc/oclHashcat
 ## Main SDK
 ##
 
-CUDA                     := deps/cuda-7.5
-CUDALIBPATH32            := deps/NVIDIA-Linux-x86_64-352.21/32
-CUDALIBPATH64            := deps/NVIDIA-Linux-x86_64-352.21
+FORCEWARELIBPATH32       := deps/NVIDIA-Linux-x86_64-352.21/32
+FORCEWARELIBPATH64       := deps/NVIDIA-Linux-x86_64-352.21
 
 AMDAPP                   := deps/amd-app-sdk
 AMDAPPLIBPATH32          := $(AMDAPP)/lib/x86
@@ -57,8 +56,8 @@ OCLLIBPATH32             := $(AMDAPPLIBPATH32)
 OCLLIBPATH64             := $(AMDAPPLIBPATH64)
 
 NVML                     := $(GDK)/usr/include/nvidia/gdk
-NVMLLIBPATH32            := $(CUDALIBPATH32)
-NVMLLIBPATH64            := $(CUDALIBPATH64)
+NVMLLIBPATH32            := $(FORCEWARELIBPATH32)
+NVMLLIBPATH64            := $(FORCEWARELIBPATH64)
 
 CLCOMPILE_PATH           := tools/clcompile
 RULES_OPTIMIZE_PATH      := tools/rules_optimize

diff --git a/tools/deps.sh b/tools/deps.sh
index 5b0cce7..f93965a 100755 (executable)
--- a/tools/deps.sh
+++ b/tools/deps.sh
@@ -4,7 +4,7 @@
 
 ## global vars
 DEPS="make gcc g++ gcc-multilib g++-multilib libc6-dev-i386 mingw-w64 build-essential unzip"
-DOWNLOAD_DEPS="ADL_SDK8.zip R352-developer.zip cuda_7.5.18_linux.run NVIDIA-Linux-x86_64-352.21.run gdk_linux_amd64_352_55_release.run AMD-APP-SDKInstaller-v3.0.130.135-GA-linux64.tar.bz2"
+DOWNLOAD_DEPS="ADL_SDK8.zip R352-developer.zip NVIDIA-Linux-x86_64-352.21.run gdk_linux_amd64_352_55_release.run AMD-APP-SDKInstaller-v3.0.130.135-GA-linux64.tar.bz2"
 
 ## enter the deps directory
 cur_directory=$(dirname ${0})
@@ -15,8 +15,8 @@ mkdir -p ${deps_dir} # but it should already exist (is part of the repository)
 cd ${deps_dir}
 
 ## cleanup the directories under the 'deps' folder
-rm -rf {adl-sdk,cuda-7.5,NVIDIA-Linux-x86_64-352.21,nvidia-gdk,amd-app-sdk} && \
-mkdir -p {tmp,adl-sdk,cuda-7.5,NVIDIA-Linux-x86_64-352.21,nvidia-gdk,amd-app-sdk} && \
+rm -rf {adl-sdk,NVIDIA-Linux-x86_64-352.21,nvidia-gdk,amd-app-sdk} && \
+mkdir -p {tmp,adl-sdk,NVIDIA-Linux-x86_64-352.21,nvidia-gdk,amd-app-sdk} && \
 cd tmp/
 
 if [ $? -ne 0 ]; then
@@ -83,25 +83,14 @@ if [[ ${ret} -ne 0 ]] && [[ ${ret} -ne 1 ]]; then
   exit 1
 fi
 
-## install CUDA SDK
-chmod +x cuda_7.5.18_linux.run && \
-./cuda_7.5.18_linux.run -toolkit -silent -override --toolkitpath=${deps_dir}/cuda-7.5
-
-if [ $? -ne 0 ]; then
-  echo "! failed to install CUDA SDK"
-  exit 1
-fi
-
 ## install NVIDIA Driver
 chmod +x NVIDIA-Linux-x86_64-352.21.run && \
 ./NVIDIA-Linux-x86_64-352.21.run -x && \
 mv NVIDIA-Linux-x86_64-352.21 ${deps_dir}/ && \
 cd ${deps_dir}/NVIDIA-Linux-x86_64-352.21 && \
 ln -s libnvidia-ml.so.352.21 libnvidia-ml.so && \
-ln -s libcuda.so.352.21 libcuda.so && \
 cd 32 && \
 ln -s libnvidia-ml.so.352.21 libnvidia-ml.so && \
-ln -s libcuda.so.352.21 libcuda.so && \
 cd ${deps_dir}/tmp
 
 if [ $? -ne 0 ]; then