From 420093a87066d6cf8948e1b066263709f170a02b Mon Sep 17 00:00:00 2001 From: sunsuodong Date: Thu, 12 Aug 2021 14:43:48 +0800 Subject: [PATCH] fix MS_API on windows --- include/api/callback/callback.h | 6 ------ include/api/callback/ckpt_saver.h | 6 ------ include/api/callback/loss_monitor.h | 6 ------ include/api/callback/lr_scheduler.h | 6 ------ include/api/callback/time_monitor.h | 6 ------ include/api/callback/train_accuracy.h | 6 ------ include/api/cfg.h | 6 ------ include/api/types.h | 4 ++++ mindspore/lite/include/lite_utils.h | 4 ++++ 9 files changed, 8 insertions(+), 42 deletions(-) diff --git a/include/api/callback/callback.h b/include/api/callback/callback.h index 8c1878c1126..d10cffeb7c4 100644 --- a/include/api/callback/callback.h +++ b/include/api/callback/callback.h @@ -23,12 +23,6 @@ #include "include/api/data_type.h" #include "include/api/dual_abi_helper.h" -#ifdef _WIN32 -#define MS_API __declspec(dllexport) -#else -#define MS_API __attribute__((visibility("default"))) -#endif - namespace mindspore { class Model; class ModelImpl; diff --git a/include/api/callback/ckpt_saver.h b/include/api/callback/ckpt_saver.h index 27f47035dc1..2c67d3a44e6 100644 --- a/include/api/callback/ckpt_saver.h +++ b/include/api/callback/ckpt_saver.h @@ -22,12 +22,6 @@ #include #include "include/api/callback/callback.h" -#ifdef _WIN32 -#define MS_API __declspec(dllexport) -#else -#define MS_API __attribute__((visibility("default"))) -#endif - namespace mindspore { class CkptSaver: public TrainCallBack { diff --git a/include/api/callback/loss_monitor.h b/include/api/callback/loss_monitor.h index 012609f183d..48684f3f1d4 100644 --- a/include/api/callback/loss_monitor.h +++ b/include/api/callback/loss_monitor.h @@ -21,12 +21,6 @@ #include #include "include/api/callback/callback.h" -#ifdef _WIN32 -#define MS_API __declspec(dllexport) -#else -#define MS_API __attribute__((visibility("default"))) -#endif - using GraphPoint = std::pair; namespace mindspore { diff --git a/include/api/callback/lr_scheduler.h b/include/api/callback/lr_scheduler.h index afe9b43d1ed..2eddc66b44a 100644 --- a/include/api/callback/lr_scheduler.h +++ b/include/api/callback/lr_scheduler.h @@ -22,12 +22,6 @@ #include #include "include/api/callback/callback.h" -#ifdef _WIN32 -#define MS_API __declspec(dllexport) -#else -#define MS_API __attribute__((visibility("default"))) -#endif - namespace mindspore { constexpr int DONT_UPDATE_LR = 0; diff --git a/include/api/callback/time_monitor.h b/include/api/callback/time_monitor.h index e38b26a0ceb..7e857849f8a 100644 --- a/include/api/callback/time_monitor.h +++ b/include/api/callback/time_monitor.h @@ -22,12 +22,6 @@ #include #include "include/api/callback/callback.h" -#ifdef _WIN32 -#define MS_API __declspec(dllexport) -#else -#define MS_API __attribute__((visibility("default"))) -#endif - namespace mindspore { class TimeMonitor: public TrainCallBack { diff --git a/include/api/callback/train_accuracy.h b/include/api/callback/train_accuracy.h index d20c42ac89d..0b31cfbc617 100644 --- a/include/api/callback/train_accuracy.h +++ b/include/api/callback/train_accuracy.h @@ -24,12 +24,6 @@ #include "include/api/callback/callback.h" #include "include/api/metrics/accuracy.h" -#ifdef _WIN32 -#define MS_API __declspec(dllexport) -#else -#define MS_API __attribute__((visibility("default"))) -#endif - using GraphPoint = std::pair; namespace mindspore { diff --git a/include/api/cfg.h b/include/api/cfg.h index 87c144f397e..a012438ee77 100644 --- a/include/api/cfg.h +++ b/include/api/cfg.h @@ -23,12 +23,6 @@ #include "include/api/data_type.h" #include "include/api/dual_abi_helper.h" -#ifdef _WIN32 -#define MS_API __declspec(dllexport) -#else -#define MS_API __attribute__((visibility("default"))) -#endif - namespace mindspore { class MixPrecisionCfg { diff --git a/include/api/types.h b/include/api/types.h index 77f200bda5c..815b39f94c7 100644 --- a/include/api/types.h +++ b/include/api/types.h @@ -27,12 +27,16 @@ #ifndef MS_API #ifdef _WIN32 +#ifdef _MSC_VER #ifdef BUILDING_DLL #define MS_API __declspec(dllexport) #else #define MS_API __declspec(dllimport) #endif #else +#define MS_API __declspec(dllexport) +#endif +#else #define MS_API __attribute__((visibility("default"))) #endif #endif diff --git a/mindspore/lite/include/lite_utils.h b/mindspore/lite/include/lite_utils.h index 92aa7856cf0..68499e79a98 100644 --- a/mindspore/lite/include/lite_utils.h +++ b/mindspore/lite/include/lite_utils.h @@ -34,12 +34,16 @@ #ifndef MS_API #ifdef _WIN32 +#ifdef _MSC_VER #ifdef BUILDING_DLL #define MS_API __declspec(dllexport) #else #define MS_API __declspec(dllimport) #endif #else +#define MS_API __declspec(dllexport) +#endif +#else #define MS_API __attribute__((visibility("default"))) #endif #endif