Add Mac OS X port #138

gangliao · 2016-09-28T10:13:45Z

No description provided.

…lign

…C OS

* Also make use cmake find to zlib. * circle link in osx, use reverse link all libs instead. But maybe osx just don't care circle link.

revise CMake for MAC OS

Mac port

# Conflicts: # paddle/math/tests/test_perturbation.cpp

emailweixu · 2016-09-28T17:11:47Z

paddle/api/Matrix.cpp

@@ -239,7 +239,7 @@ void Matrix::toNumpyMatInplace(float** view_data, int* dim1,
 }
 void Matrix::copyToNumpyMat(float** view_m_data, int* dim1,
                            int* dim2) throw(UnsupportError) {
-  static_assert(sizeof(paddle::real) == sizeof(float),
+  static_assert(sizeof(float) == sizeof(float),


sizeof(paddle::real)

emailweixu · 2016-09-28T17:12:30Z

paddle/api/Matrix.cpp

@@ -251,12 +251,12 @@ void Matrix::copyToNumpyMat(float** view_m_data, int* dim1,
    if (auto cpuMat = dynamic_cast<paddle::CpuMatrix*>(m->mat.get())) {
      auto src = cpuMat->getData();
      auto dest = *view_m_data;
-      std::memcpy(dest, src, sizeof(paddle::real) * (*dim1) * (*dim2));
+      std::memcpy(dest, src, sizeof(float) * (*dim1) * (*dim2));


sizeof(paddle::real)

emailweixu · 2016-09-28T17:12:40Z

paddle/api/Matrix.cpp

    } else if (auto gpuMat = dynamic_cast<paddle::GpuMatrix*>(m->mat.get())) {
      auto src = gpuMat->getData();
      auto dest = *view_m_data;
      hl_memcpy_device2host(dest, src,
-                            sizeof(paddle::real) * (*dim1) * (*dim2));
+                            sizeof(float) * (*dim1) * (*dim2));


sizeof(paddle::real)

emailweixu · 2016-09-28T17:15:10Z

paddle/api/paddle_ld_flags.py

@@ -56,9 +69,9 @@ def parent_dir_str(self):

        def libs_str(self):
            libs = [
-                "-Wl,--whole-archive",
+                whole_start,


for apple, do we need to use " "-Wl,-force_load" instead, as what you does in cmake

Already done this via "-Wl, all_load" in line 48, /Users/liaogang/baidu/Paddle/paddle/setup.py.in.

emailweixu · 2016-09-28T17:19:20Z

paddle/gserver/gradientmachines/NeuralNetwork.cpp

 NeuralNetwork* NeuralNetwork::newNeuralNetwork(
    const std::string& name,
    NeuralNetwork* rootNetwork) {
-  if (newCustomNeuralNetwork) {


newCustomNeuralNetwork needs to be kept. If not possible on MacOS, we can use #ifdef

use cmake to fix this

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") list(APPEND LIBS "-undefined dynamic_lookup") endif()

emailweixu · 2016-09-28T17:28:15Z

paddle/utils/PythonUtil.cpp

  CHECK_PY(pyModule) << "Import module " << moduleName << " failed.";
  PyObjectPtr pyDict(PyModule_GetDict(pyModule.get()));
  CHECK_PY(pyDict) << "Get Dict failed.";
  PyObjectPtr pyClass(PyDict_GetItemString(pyDict.get(), className.c_str()));
-  LOG(INFO) << "createPythonClass className.c_str():" << className.c_str();
+  // LOG(INFO) << "createPythonClass className.c_str():" << className.c_str();


Either uncomment it or delete it.

emailweixu · 2016-09-28T17:29:53Z

paddle/utils/PythonUtil.h

+// #ifndef _XOPEN_SOURCE
+// #warning "no _XOPEN_SOURCE defined in Python.h"
+// #endif
+


uncomment or delete

emailweixu · 2016-09-28T17:31:05Z

paddle/utils/Thread.h

+#endif
+  CHECK_NE(tid, -1);
+  return tid;
+}


line 21-32 can share code with getTID() in Stat.cpp

emailweixu · 2016-09-28T17:31:24Z

paddle/utils/ThreadLocal.h

+    #define __NR_gettid 224
+    #endif
+    pid_t tid = syscall(__NR_gettid);
+#endif


emailweixu · 2016-09-29T00:00:44Z

paddle/trainer/tests/test_CompareSparse.cpp

@@ -146,12 +146,12 @@ TEST(compareSparse, remote_cpu) {
 TEST(compareSparse, cpu10_local_vs_remote) {
  FLAGS_local = 1;  // disable remote sparse update in parameter config
  std::vector<ParameterPtr> localParameters =
-      trainerOnePassTest(configFile1, true, 10);
+      trainerOnePassTest(configFile1, true, 2);


why can't "10" work?

reyoung · 2016-09-29T02:47:51Z

cmake/cblas.cmake

@@ -44,8 +44,8 @@ set(ATLAS_LIB_SEARCH_PATHS
        /usr/lib
        /usr/lib/blas/atlas
        /usr/lib/atlas
-        /usr/lib/atlas-base   # special for ubuntu 14.04.
-    )


this line code be revert

reyoung · 2016-09-29T02:51:24Z