Follow @Openwall on Twitter for new release announcements and other news
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Mon, 20 Feb 2012 21:03:33 +0100
From: magnum <john.magnum@...hmail.com>
To: john-dev@...ts.openwall.com
Subject: Fwd: openCL reorganization in jtr

Here's a suggestion that was sent directly to me. It seems like a good
idea but I don't want to make such changes unless Samuele and others agree.

All future stuff to the list please (unless you want me to proxy for
anonymity, which was not the case here).

magnum


-------- Original Message --------
Subject: 	openCL reorganization in jtr
Date: 	Mon, 20 Feb 2012 15:51:33 -0200
From: 	Claudio André
To: 	magnum



Hi

Since you have been doing some tasks related to openCL, i think is not a
bad idea to move all the *.cl files to its own folder (as was done in
cuda folder). See below:

    cd src
    mkdir opencl
    mv *.cl opencl

And apply the patch in Makefile

----

:100644 100644 f55ffa4... 0000000... M    src/Makefile

diff --git src/Makefile src/Makefile
index f55ffa4..bb69a9e 100644
--- src/Makefile
+++ src/Makefile
@@ -293,7 +293,7 @@ linux-x86-64-gpu:
         JOHN_OBJS="$(JOHN_OBJS) $(OCL_OBJS) $(CUDA_OBJS) c3_fmt.o
x86-64.o sse-intrinsics-64.o" \
         CFLAGS="$(CFLAGS) -I$(NVIDIA_CUDA)/include
-I$(ATISTREAMSDKROOT)/include -DHAVE_CRYPT -DCL_VERSION_1_0 -DHAVE_CUDA
-DHAVE_DL" \
         LDFLAGS="$(LDFLAGS) -L$(ATISTREAMSDKROOT)/lib/x86_64
-L$(NVIDIA_CUDA)/lib64 -L$(CUDA64PATH) -lcrypt -lOpenCL -ldl -lcudart"
-    $(CP) *.cl ../run/
+    $(CP) opencl/*.cl ../run/
     #/bin/sh ./setup-opencl-stuff.sh

 linux-x86-64-opencl:
@@ -303,7 +303,7 @@ linux-x86-64-opencl:
         JOHN_OBJS="$(JOHN_OBJS) $(OCL_OBJS) c3_fmt.o x86-64.o
sse-intrinsics-64.o" \
         CFLAGS="$(CFLAGS) -I$(NVIDIA_CUDA)/include
-I$(ATISTREAMSDKROOT)/include -DHAVE_CRYPT -DCL_VERSION_1_0 -DHAVE_DL" \
         LDFLAGS="$(LDFLAGS) -L$(ATISTREAMSDKROOT)/lib/x86_64
-L$(NVIDIA_CUDA)/lib64 -lcrypt -lOpenCL -ldl"
-    $(CP) *.cl ../run/
+    $(CP) opencl/*.cl ../run/
     #/bin/sh ./setup-opencl-stuff.sh

 linux-x86-64-cuda:
@@ -420,7 +420,7 @@ linux-x86-gpu:
         JOHN_OBJS="$(JOHN_OBJS) $(OCL_OBJS) $(CUDA_OBJS) c3_fmt.o x86.o
x86-sse.o sha1-mmx.o md4-mmx.o md5-mmx.o sse-intrinsics-32.o" \
         CFLAGS="$(CFLAGS) -I$(NVIDIA_CUDA)/include
-I$(ATISTREAMSDKROOT)/include -DHAVE_CRYPT -DCL_VERSION_1_0 -DHAVE_CUDA
-DHAVE_DL" \
         LDFLAGS="$(LDFLAGS) -L$(ATISTREAMSDKROOT)/lib/x86
-L$(NVIDIA_CUDA)/lib -L$(CUDAPATH) -lcrypt -lOpenCL -ldl -lcudart"
-    $(CP) *.cl ../run/
+    $(CP) opencl/*.cl ../run/
     #/bin/sh ./setup-opencl-stuff.sh

 linux-x86-opencl:
@@ -430,7 +430,7 @@ linux-x86-opencl:
         JOHN_OBJS="$(JOHN_OBJS) $(OCL_OBJS) c3_fmt.o x86.o x86-sse.o
sha1-mmx.o md4-mmx.o md5-mmx.o sse-intrinsics-32.o" \
         CFLAGS="$(CFLAGS) -I$(NVIDIA_CUDA)/include
-I$(ATISTREAMSDKROOT)/include -DHAVE_CRYPT -DCL_VERSION_1_0 -DHAVE_DL" \
         LDFLAGS="$(LDFLAGS) -L$(ATISTREAMSDKROOT)/lib/x86
-L$(NVIDIA_CUDA)/lib -lcrypt -lOpenCL -ldl"
-    $(CP) *.cl ../run/
+    $(CP) opencl/*.cl ../run/
     #/bin/sh ./setup-opencl-stuff.sh

 linux-x86-cuda:
@@ -940,7 +940,7 @@ macosx-x86-64-opencl:
         ASFLAGS="$(ASFLAGS) -m64 -DUNDERSCORES -DBSD -DALIGN_LOG" \
         CFLAGS="$(CFLAGS) -m64  -I$(NVIDIA_CUDA)/include
-I$(ATISTREAMSDKROOT)/include  -DBSD -DCL_VERSION_1_0" \
         LDFLAGS="$(LDFLAGS) -m64 -L$(ATISTREAMSDKROOT)/lib/x86_64
-L$(NVIDIA_CUDA)/lib64 -framework OpenCL"
-    $(CP) *.cl ../run/
+    $(CP) opencl/*.cl ../run/
     #/bin/sh ./setup-opencl-stuff.sh

 macosx-x86-64:

Powered by blists - more mailing lists

Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.