diff --git a/paddle/gserver/dataproviders/PyDataProvider.cpp b/paddle/gserver/dataproviders/PyDataProvider.cpp
index cc3e09a3c2ecb4cd172bb3abf6e09aff5ebcc784..1332c0ab635b6ebec05f25fd77b9703b39227bc1 100644
--- a/paddle/gserver/dataproviders/PyDataProvider.cpp
+++ b/paddle/gserver/dataproviders/PyDataProvider.cpp
@@ -46,7 +46,6 @@ PyDataProvider::PyDataProvider(const DataConfig& config, bool useGpu,
 }
 
 void PyDataProvider::loadData(const std::vector<std::string>& fileList) {
-  int feFlag = fegetexcept();
   VLOG(1) << "module:" << pyModuleName_ << " class:" << pyClassName_;
   classInstance_ =
       createPythonClass(pyModuleName_, pyClassName_, fileList, pyUserArgs_);
@@ -57,7 +56,7 @@ void PyDataProvider::loadData(const std::vector<std::string>& fileList) {
   std::string headerInfo =
       std::string(PyString_AsString(obj.get()), PyString_Size(obj.get()));
   parseHeaderData(headerInfo);
-  feenableexcept(feFlag);
+  feenableexcept(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
 }
 
 void PyDataProvider::parseHeaderData(const std::string& headerData) {
diff --git a/paddle/math/PoolAllocator.h b/paddle/math/PoolAllocator.h
index a50deece3a85359754c7f2b265c8f7013f66c5e5..aca8ffb0ab42e10d76dc9fbaad657a8afab316e9 100644
--- a/paddle/math/PoolAllocator.h
+++ b/paddle/math/PoolAllocator.h
@@ -53,11 +53,7 @@ private:
   void printAll();
   std::unique_ptr<Allocator> allocator_;
   std::mutex mutex_;
-#if defined(__APPLE__) || defined(__OSX__)
-  std::map<size_t, std::vector<void*>> pool_;
-#else
   std::unordered_map<size_t, std::vector<void*>> pool_;
-#endif
   size_t sizeLimit_;
   size_t poolMemorySize_;
   std::string name_;