use MCX_CONTAINER and env macros to replace extra PYMCX_CONTAINER

Author: fangq

src/CMakeLists.txt

@@ -107,7 +107,7 @@ if (BUILD_PYTHON)
             ubj/ubjw.c
             pymcx.cpp
             )
-    target_compile_definitions(pymcx PUBLIC PYMCX_CONTAINER)
+    target_compile_definitions(pymcx PUBLIC MCX_CONTAINER)
 
     target_link_libraries(pymcx OpenMP::OpenMP_CXX zmat ZLIB::ZLIB pybind11::module pybind11::lto pybind11::windows_extras)
 

src/mcx_utils.c

@@ -319,9 +319,11 @@ void mcx_initcfg(Config *cfg){
      memset(cfg->workload,0,MAX_DEVICE*sizeof(float));
      cfg->deviceid[0]='1';  /** use the first GPU device by default*/
 #if defined(MCX_CONTAINER)
+  #ifndef PYBIND11_VERSION_MAJOR
      cfg->parentid=mpMATLAB;
-#elif defined(PYMCX_CONTAINER)
+  #else
      cfg->parentid=mpPython;
+  #endif
 #else
      cfg->parentid=mpStandalone;
 #endif
@@ -1087,7 +1089,7 @@ void mcx_flush(Config *cfg){
  */
 
 void mcx_error(const int id,const char *msg,const char *file,const int linenum){
-#if defined(MCX_CONTAINER) || defined(PYMCX_CONTAINER)
+#ifdef MCX_CONTAINER
      mcx_throw_exception(id,msg,file,linenum);
 #else
      MCX_FPRINTF(stdout,S_RED "\nMCX ERROR(%d):%s in unit %s:%d\n" S_RESET,id,msg,file,linenum);

src/mcx_utils.h

@@ -316,14 +316,7 @@ extern "C"
  void mcx_matlab_flush(void);
 #endif
 
-#ifdef PYMCX_CONTAINER
-#ifdef __cplusplus
-extern "C"
-#endif
- int  mcx_throw_exception(const int id, const char *msg, const char *filename, const int linenum);
-#endif
-
-#ifdef MCX_CONTAINER
+#if defined(MCX_CONTAINER) && defined(PYBIND11_VERSION_MAJOR)
  #ifdef _OPENMP
   #define MCX_FPRINTF(fp,...) {if(omp_get_thread_num()==0) mexPrintf(__VA_ARGS__);}  /**< macro to print messages, calls mexPrint if inside MATLAB */
  #else