Merge pull request apache#27 from tqchen/refactor

Refactor
stefanhenneking · Feb 19, 2015 · 1e35c4a · 1e35c4a
2 parents 477b600 + a909a8a
commit 1e35c4a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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

diff --git 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<DType>();
 
-    updater_->InitServer(myRank(), conf);
+    updater_->InitUpdater(myRank(), conf);
     shared_model_ = new PS::KVArray<DType>();
     shared_model_->setUpdater(updater_);
   }

diff --git a/mshadow/tensor_container.h b/mshadow/tensor_container.h
@@ -49,7 +49,7 @@ class TensorContainer: public Tensor<Device, dimension, DType> {
    */
   explicit TensorContainer(const Shape<dimension> &shape, DType initv) {
     this->pad_ = MSHADOW_ALLOC_PAD;
-    data_.dptr = NULL;
+    data_.dptr_ = NULL;
     this->AllocByShape(shape);
     (*this) = initv;
   }