From 197c9e692cb68ecd9316faa4f00553ecb9572404 Mon Sep 17 00:00:00 2001 From: Mu Li Date: Sat, 14 Feb 2015 11:10:38 -0500 Subject: [PATCH 1/3] fix bug in ps_dist-inl.h --- mshadow-ps/ps_dist-inl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mshadow-ps/ps_dist-inl.h b/mshadow-ps/ps_dist-inl.h index ed955e9da6a1..ffde1799c5e8 100644 --- a/mshadow-ps/ps_dist-inl.h +++ b/mshadow-ps/ps_dist-inl.h @@ -95,7 +95,7 @@ class MShadowServerNode : public PS::App { MShadowServerNode(const std::string &conf) : App() { updater_ = CreateModelUpdater(); - updater_->InitServer(myRank(), conf); + updater_->InitUpdater(myRank(), conf); shared_model_ = new PS::KVArray(); shared_model_->setUpdater(updater_); } From 00dab41ef60307b9926b948692e74e912062d1ab Mon Sep 17 00:00:00 2001 From: Johan Pauwels Date: Sat, 14 Feb 2015 21:24:40 +0100 Subject: [PATCH 2/3] Made Intel MKL path platform dependent --- make/mshadow.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/make/mshadow.mk b/make/mshadow.mk index 6e7b68b7b989..5a0a65109573 100644 --- a/make/mshadow.mk +++ b/make/mshadow.mk @@ -24,8 +24,14 @@ endif ifeq ($(USE_BLAS), mkl) ifneq ($(USE_INTEL_PATH), NONE) - MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/mkl/lib/intel64 - MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/lib/intel64 + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Darwin) + MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/mkl/lib + MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/lib + else + MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/mkl/lib/intel64 + MSHADOW_LDFLAGS += -L$(USE_INTEL_PATH)/lib/intel64 + endif MSHADOW_CFLAGS += -I$(USE_INTEL_PATH)/mkl/include endif MSHADOW_LDFLAGS += -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 From 9460b8aa2439feff3dc78dbac8afda755593965f Mon Sep 17 00:00:00 2001 From: Johan Pauwels Date: Thu, 19 Feb 2015 16:27:47 +0100 Subject: [PATCH 3/3] Fixed compile error in TensorContainer initialising constructor --- mshadow/tensor_container.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mshadow/tensor_container.h b/mshadow/tensor_container.h index dbf250ceed28..19ebc2658040 100644 --- a/mshadow/tensor_container.h +++ b/mshadow/tensor_container.h @@ -49,7 +49,7 @@ class TensorContainer: public Tensor { */ explicit TensorContainer(const Shape &shape, DType initv) { this->pad_ = MSHADOW_ALLOC_PAD; - data_.dptr = NULL; + data_.dptr_ = NULL; this->AllocByShape(shape); (*this) = initv; }