Merge pull request #4 from jserv/conditional-build

Enable conditional build

.gitignore

@@ -0,0 +1,24 @@
+# Generated files
+build/
+
+# Object files                                                                                                                                                
+*.o
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects
+*.dll
+*.so
+*.so.*
+*.dylib

Makefile

@@ -4,13 +4,35 @@ SRC ?= ./src
 OUT ?= ./build
 
 CFLAGS = -Os -fPIC -g
-LDFLAGS = -L$(OPENCL_LIB) -lpthread -lOpenCL
+LDFLAGS = -lpthread
+
+# FIXME: avoid hardcoded architecture flags. We might support advanced SIMD
+# instructions for Intel and Arm later.
+CFLAGS += -msse2
+
+ifneq ("$(DISABLE_GPU)","1")
+CFLAGS += \
+	-DBUILD_OPENCL \
+	-I$(OPENCL_PATH)/include
+LDFLAGS += -L$(OPENCL_LIB) -lOpenCL
+endif
+
+ifneq ("$(DISABLE_JNI)","1")
+CFLAGS += \
+	-I$(OPENJDK_PATH)/include \
+	-I$(OPENJDK_PATH)/include/linux
+endif
 
 TESTS = \
 	trinary \
 	curl \
-	pow_sse \
+	pow_sse
+
+ifneq ("$(DISABLE_GPU)","1")
+TESTS += \
 	pow_cl
+endif
+
 TESTS := $(addprefix $(OUT)/test_, $(TESTS))
 
 LIBS = libdcurl.so
@@ -23,31 +45,34 @@ OBJS = \
 	constants.o \
 	trinary/trinary.o \
 	dcurl.o \
-	pow_sse.o \
+	pow_sse.o
+
+ifneq ("$(DISABLE_GPU)","1")
+OBJS += \
 	pow_cl.o \
 	clcontext.o
-OBJS := $(addprefix $(OUT)/, $(OBJS))
-deps := $(OBJS:%.o=%.o.d)
+endif
 
-# Control the build verbosity
-ifeq ("$(VERBOSE)","1")
-    Q :=
-    VECHO = @true
-else
-    Q := @
-    VECHO = @printf
+ifneq ("$(DISABLE_JNI)","1")
+OBJS += \
+	jni/iri-pearldiver-exlib.o
 endif
 
+OBJS := $(addprefix $(OUT)/, $(OBJS))
+deps := $(OBJS:%.o=%.o.d)
+
 SUBDIRS = \
 	hash \
-	trinary
+	trinary \
+	jni
 SHELL_HACK := $(shell mkdir -p $(OUT))
 SHELL_HACK := $(shell mkdir -p $(addprefix $(OUT)/,$(SUBDIRS)))
 
 $(OUT)/test_%.o: test/test_%.c
 	$(VECHO) "  CC\t$@\n"
 	$(Q)$(CC) -o $@ $(CFLAGS) -c -MMD -MF $@.d $<
 
+$(OUT)/jni/%.o: jni/%.c
 $(OUT)/trinary/%.o: $(SRC)/trinary/%.c
 $(OUT)/hash/%.o: $(SRC)/hash/%.c
 $(OUT)/%.o: $(SRC)/%.c
@@ -56,22 +81,11 @@ $(OUT)/%.o: $(SRC)/%.c
 
 $(OUT)/test_%: $(OUT)/test_%.o $(OBJS)
 	$(VECHO) "  LD\t$@\n"
-	$(Q) gcc -I$(OPENCL_PATH)/include -o $@ $^ $(LDFLAGS)
-
-$(OUT)/libdcurl.so: ./jni/iri-pearldiver-exlib.c $(OBJS)
-	gcc -fPIC -msse2 -shared \
-	    -I$(OPENJDK_PATH)/include -I$(OPENJDK_PATH)/include/linux \
-	    -I$(OPENCL_PATH)/include -o $@ $^ $(LDFLAGS)
-
-PASS_COLOR = \e[32;01m
-NO_COLOR = \e[0m
+	$(Q)$(CC) -o $@ $^ $(LDFLAGS)
 
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Darwin)
-	PRINTF = printf
-else
-	PRINTF = env printf
-endif
+$(OUT)/libdcurl.so: $(OBJS)
+	$(VECHO) "  LD\t$@\n"
+	$(Q)$(CC) -shared -o $@ $^ $(LDFLAGS)
 
 $(OUT)/test_%.done: $(OUT)/test_%
 	$(Q)./$< && $(PRINTF) "*** $< *** $(PASS_COLOR)[ Verified ]$(NO_COLOR)\n"
@@ -80,4 +94,5 @@ check: $(addsuffix .done, $(TESTS))
 clean:
 	$(RM) -r $(OUT)
 
+include mk/common.mk
 -include $(deps)

README.md

@@ -12,9 +12,14 @@ Reference Implementation (IRI).
 * Only one GPU can be facilitated with dcurl at the moment.
 
 # Build
-* Build a shared library for IRI, placed in ```build```
-
-```$ make```
+* Build a shared library for IRI, generating object files in directory `build`
+```shell
+$ make
+```
+Alternatively, you can specify conditional build as following:
+```shell
+$ make DISABLE_GPU=1 DISABLE_JNI=1
+```
 
 # Test
 * Make a test

mk/common.mk

@@ -0,0 +1,18 @@
+# Control the build verbosity
+ifeq ("$(VERBOSE)","1")
+    Q :=
+    VECHO = @true
+else
+    Q := @
+    VECHO = @printf
+endif
+
+PASS_COLOR = \e[32;01m
+NO_COLOR = \e[0m
+
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+	PRINTF = printf
+else
+	PRINTF = env printf
+endif

src/dcurl.c

@@ -55,15 +55,19 @@ void dcurl_init(int max_cpu_thread, int max_gpu_thread)
     pthread_mutex_init(&mtx, NULL);
     sem_init(&notify, 0, 0);
     pow_sse_init(MAX_CPU_THREAD);
+#if defined(ENABLE_OPENCL)
     pwork_ctx_init(MAX_GPU_THREAD);
+#endif
 }
 
 void dcurl_destroy()
 {
     free(cpu_mutex_id);
     free(gpu_mutex_id);
     pow_sse_destroy();
+#if defined(ENABLE_OPENCL)
     pwork_ctx_destroy(MAX_GPU_THREAD);
+#endif
 }
 
 Trytes_t *dcurl_entry(Trytes_t *trytes, int mwm)
@@ -107,9 +111,11 @@ Trytes_t *dcurl_entry(Trytes_t *trytes, int mwm)
         case 1:
             ret_trytes = PowSSE(trytes, mwm, selected_mutex_id);
             break;
+#if defined(ENABLE_OPENCL)
         case 2:
             ret_trytes = PowCL(trytes, mwm, selected_mutex_id);
             break;
+#endif
         default:
             printf("error produced\n");
             exit(0);