Adapts Makefile and stage script to subtree'd DimmWitted

HazyResearch · Jan 23, 2017 · 509f91c · 509f91c
1 parent ef35f58
commit 509f91c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -137,6 +137,11 @@ build:
 	# record version and build info
 	util/build/generate-build-info.sh >$(BUILD_INFO)
 
+# build DimmWitted
+build: inference/dimmwitted/dw
+inference/dimmwitted/dw:
+	$(@D).build.sh
+
 # ensure some submodules required by stage.sh is there
 build: \
     extern/buildkit/install-shared-libraries-required-by \
@@ -184,7 +189,6 @@ checkstyle:
 
 # submodules to build and the files to copy out from each of them
 include util/build/build-submodules.mk
-$(call BUILD_SUBMODULE_AND_COPY, inference/dimmwitted, dw                                                   )
 $(call BUILD_SUBMODULE_AND_COPY, compiler/ddlog      , target/scala-2.11/ddlog-assembly-0.1-SNAPSHOT.jar    )
 $(call BUILD_SUBMODULE_AND_COPY, runner/mkmimo       , mkmimo                                               )
 ifndef NO_MINDBENDER
@@ -193,9 +197,9 @@ endif
 
 # XXX legacy targets kept to reduce surprise
 .PHONY: build-sampler
-build-sampler: build-submodule-dimmwitted
+build-sampler: inference/dimmwitted/dw
 .PHONY: build-dimmwitted
-build-dimmwitted: build-submodule-dimmwitted
+build-dimmwitted: inference/dimmwitted/dw
 .PHONY: build-mindbender
 build-mindbender: build-submodule-mindbender
 .PHONY: build-ddlog

diff --git a/stage.sh b/stage.sh
@@ -133,9 +133,9 @@ stage ddlib/deepdive.py                                           lib/python/
 #  copying shared libraries required by the dimmwitted sampler and generating a wrapper
 PATH="$PWD"/extern/buildkit:"$PATH"
 for cmd in dw; do
-stage .build/submodule/inference/dimmwitted/$cmd              	  util/sampler-$cmd.bin
+stage inference/dimmwitted/$cmd              	                  util/sampler-$cmd.bin
 install-shared-libraries-required-by  "$STAGE_DIR"/lib/dw \
-      .build/submodule/inference/dimmwitted/$cmd
+      inference/dimmwitted/$cmd
 generate-wrapper-for-libdirs          "$STAGE_DIR"/util/sampler-$cmd \
                                       "$STAGE_DIR"/util/sampler-$cmd.bin \
                                       "$STAGE_DIR"/lib/dw