Merge pull request #193 from happynear/msvc

Add Visual Studio compatible macros. Thanks for the contribution! This is merged

CONTRIBUTORS.md

@@ -41,3 +41,5 @@ List of Contributors
   - To contributors: please add your name to the list when you submit a patch to the project:)
 * [Qiang Kou](https://github.com/thirdwing)
   - KK is a R ninja, he will make mxnet available for R users.
+* [Feng Wang](https://github.com/happynear)
+  - Feng makes mxnet compatible with Windows Visual Studio.

python/mxnet/libinfo.py

@@ -16,10 +16,11 @@ def find_lib_path():
     api_path = os.path.join(curr_path, '../../lib/')
     dll_path = [curr_path, api_path]
     if os.name == 'nt':
+        vs_configuration = 'Release'
         if platform.architecture()[0] == '64bit':
-            dll_path.append(os.path.join(api_path, '../../windows/x64/Release/'))
+            dll_path.append(os.path.join(curr_path, '../../windows/x64', vs_configuration))
         else:
-            dll_path.append(os.path.join(api_path, '../../windows/Release/'))
+            dll_path.append(os.path.join(curr_path, '../../windows', vs_configuration))
     if os.name == 'nt':
         dll_path = [os.path.join(p, 'mxnet.dll') for p in dll_path]
     else:

src/common/object_pool.h

@@ -157,8 +157,13 @@ void ObjectPool<T>::AllocateChunk() {
   static_assert(alignof(LinkedList) % alignof(T) == 0, "ObjectPooll Invariant");
   static_assert(kPageSize % alignof(LinkedList) == 0, "ObjectPooll Invariant");
   void* new_chunk_ptr;
+#ifdef _MSC_VER
+  new_chunk_ptr = _aligned_malloc(kPageSize, kPageSize);
+  CHECK_NE(new_chunk_ptr, NULL) << "Allocation failed";
+#else
   int ret = posix_memalign(&new_chunk_ptr, kPageSize, kPageSize);
   CHECK_EQ(ret, 0) << "Allocation failed";
+#endif
   allocated_.emplace_back(new_chunk_ptr);
   auto new_chunk = static_cast<LinkedList*>(new_chunk_ptr);
   auto size = kPageSize / sizeof(LinkedList);

src/io/image_augmenter.h

@@ -114,6 +114,9 @@ class ImageAugmenter {
     }
   }
 #if MXNET_USE_OPENCV
+#ifdef _MSC_VER
+#define M_PI CV_PI
+#endif
   /*!
    * \brief augment src image, store result into dst
    *   this function is not thread safe, and will only be called by one thread

src/io/iter_mnist.cc

@@ -171,7 +171,11 @@ class MNISTIter: public IIterator<TBlobBatch> {
     unsigned char buf[4];
     CHECK(fi->Read(buf, sizeof(buf)) == sizeof(buf))
         << "invalid mnist format";
+#ifdef _MSC_VER
+    return (buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3]);
+#else
     return reinterpret_cast<int>(buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3]);
+#endif
   }
 
  private:

src/storage/cpu_device_storage.h

@@ -39,7 +39,9 @@ class CPUDeviceStorage {
 
 inline void* CPUDeviceStorage::Alloc(size_t size) {
 #if _MSC_VER
-  return CHECK_NOTNULL(_aligned_malloc(size, alignment_));
+  void* ptr;
+  ptr = _aligned_malloc(size, alignment_);
+  return CHECK_NOTNULL(ptr);
 #else
   void* ptr;
   int ret = posix_memalign(&ptr, alignment_, size);
@@ -48,7 +50,13 @@ inline void* CPUDeviceStorage::Alloc(size_t size) {
 #endif
 }
 
-inline void CPUDeviceStorage::Free(void* ptr) { free(ptr); }
+inline void CPUDeviceStorage::Free(void* ptr) {
+#if _MSC_VER
+  _aligned_free(ptr);
+#else
+  free(ptr);
+#endif
+}
 
 }  // namespace storage
 }  // namespace mxnet