Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

fix windows linkage problem with dllexport #357

Merged
merged 6 commits into from
Oct 22, 2015
Merged

fix windows linkage problem with dllexport #357

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d0f29d
fix windows linkage problem by adding dllexport
hjk41 Oct 22, 2015
3ec9344
change MXAPI to MXNET_API
hjk41 Oct 22, 2015
6270fd1
Merge branch 'master' into dllexport
hjk41 Oct 22, 2015
89dda75
minor
hjk41 Oct 22, 2015
d01562a
Merge branch 'master' of https://github.com/dmlc/mxnet into dllexport
hjk41 Oct 22, 2015
92557aa
Merge branch 'dllexport' of https://github.com/hjk41/mxnet into dllex…
hjk41 Oct 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions include/mxnet/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 MXAPI
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change to MXNET_API

#endif

/*! \brief namespace of mxnet */
namespace mxnet {
/*! \brief mxnet cpu */
Expand Down
2 changes: 1 addition & 1 deletion include/mxnet/engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion include/mxnet/storage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace mxnet {
/*!
* \brief Storage manager across multiple devices.
*/
class Storage {
class MXNET_API Storage {
public:
/*!
* \brief Storage handle.
Expand Down