Merge pull request #357 from hjk41/dllexport

fix windows linkage problem with dllexport
apache · Oct 22, 2015 · 3e91cc9 · 3e91cc9
2 parents 69bbea3 + 92557aa
commit 3e91cc9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/include/mxnet/base.h b/include/mxnet/base.h
@@ -49,6 +49,19 @@
 #endif
 #endif
 
+/*!
+* \brief define dllexport for Visual Studio
+*/
+#ifdef _MSC_VER
+#ifdef MXNET_EXPORTS
+#define MXNET_API __declspec(dllexport)
+#else
+#define MXNET_API __declspec(dllimport)
+#endif
+#else
+#define MXNET_API
+#endif
+
 /*! \brief namespace of mxnet */
 namespace mxnet {
 /*! \brief mxnet cpu */

diff --git a/include/mxnet/engine.h b/include/mxnet/engine.h
@@ -45,7 +45,7 @@ enum class FnProperty {
 /*!
  * \brief Dependency engine that schedules operations.
 */
-class Engine {
+class MXNET_API Engine {
  public:
   /*!
    * \brief OnComplete Callback to the engine,

diff --git a/include/mxnet/storage.h b/include/mxnet/storage.h
@@ -14,7 +14,7 @@ namespace mxnet {
 /*!
  * \brief Storage manager across multiple devices.
  */
-class Storage {
+class MXNET_API Storage {
  public:
   /*!
    * \brief Storage handle.