Changeset 14127


Ignore:
Timestamp:
Nov 20, 2019 9:56:35 AM (3 weeks ago)
Author:
randersson
Message:

#5819 Merged revisions r14081,r14087,r14092,r14095-r14096,r14100,r14109,r14115,r14117-r14118,r14120,r14122,r14126 to trunk

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Compiler/UsersGuide/doc/ThirdpartyDependencies.xml

    r14056 r14127  
    323323
    324324<member>
    325 <para><link xlink:href="https://www.numpy.org">numpy 1.17.2</link></para>
     325<para><link xlink:href="https://www.numpy.org">numpy 1.17.1</link></para>
    326326</member>
    327327
  • trunk/Makefile.in

    r14056 r14127  
    352352CMAKE_CASADI_CXX_FLAG64 = -m64
    353353CMAKE_CASADI_COMPILER_ARGS64 = -m64 -fpermissive
    354 @BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_BUILD_DIR = $(CASADI_BUILD_DIR64)
    355 @BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_BUILD_DIR = $(CASADI_BUILD_DIR)
    356 @BUILD_WITH_PYTHON32_FALSE@TMP_SWIGCHECK_BUILD_DIR = $(SWIGCHECK_BUILD_DIR64)
    357 @BUILD_WITH_PYTHON32_TRUE@TMP_SWIGCHECK_BUILD_DIR = $(SWIGCHECK_BUILD_DIR)
    358 @BUILD_WITH_PYTHON32_FALSE@TMP_CMAKE_CASADI_CXX_FLAG = $(CMAKE_CASADI_CXX_FLAG64)
    359 @BUILD_WITH_PYTHON32_TRUE@TMP_CMAKE_CASADI_CXX_FLAG = $(CMAKE_CASADI_CXX_FLAG)
    360 @BUILD_WITH_PYTHON32_FALSE@TMP_CMAKE_CASADI_ARGS = $(CMAKE_CASADI_ARGS64)
    361 @BUILD_WITH_PYTHON32_TRUE@TMP_CMAKE_CASADI_ARGS = $(CMAKE_CASADI_ARGS)
    362 @BUILD_WITH_PYTHON32_FALSE@TMP_CMAKE_CASADI_COMPILER_ARGS = $(CMAKE_CASADI_COMPILER_ARGS64)
    363 @BUILD_WITH_PYTHON32_TRUE@TMP_CMAKE_CASADI_COMPILER_ARGS = $(CMAKE_CASADI_COMPILER_ARGS)
    364 
    365 # note we set directories to those without 64bit suffix
    366 @BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_INST_DIR = $(CASADI_INST_DIR)
    367 @BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_INST_DIR = $(CASADI_INST_DIR)
    368 @BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_PLUGIN_INST_DIR = $(CASADI_PLUGIN_INST_DIR)
    369 @BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_PLUGIN_INST_DIR = $(CASADI_PLUGIN_INST_DIR)
    370 @BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_PYTHON_INST_DIR = $(CASADI_PYTHON_INST_DIR)
    371 @BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_PYTHON_INST_DIR = $(CASADI_PYTHON_INST_DIR)
    372 @BUILD_WITH_PYTHON32_FALSE@TMP_MC_LIB = $(MC_LIB64)
    373 @BUILD_WITH_PYTHON32_TRUE@TMP_MC_LIB = $(MC_LIB)
    374 @BUILD_WITH_PYTHON32_FALSE@TMP_MC_BUILD = $(MC_BUILD64)
    375 @BUILD_WITH_PYTHON32_TRUE@TMP_MC_BUILD = $(MC_BUILD)
    376354@NUMPY_NO_MSVCR_FALSE@NUMPY_NO_MSVCR_ARG =
    377355@NUMPY_NO_MSVCR_TRUE@NUMPY_NO_MSVCR_ARG = --no-msvcr="true"
     
    911889casadi:
    912890@COMPILE_WITH_IPOPT_TRUE@   cd $(abs_builddir)/ThirdParty/CasADi; \
    913 @COMPILE_WITH_IPOPT_TRUE@   make -f Makefile  "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)" "CASADI_PYTHON_INST_DIR=${TMP_CASADI_PYTHON_INST_DIR}" "CASADI_INST_DIR=${TMP_CASADI_INST_DIR}" "CASADI_PLUGIN_INST_DIR=${TMP_CASADI_PLUGIN_INST_DIR}" "CMAKE_CASADI_ARGS=${TMP_CMAKE_CASADI_ARGS}" "CMAKE_CASADI_COMPILER_ARGS=${TMP_CMAKE_CASADI_COMPILER_ARGS}" "CMAKE_CASADI_CXX_FLAG=${TMP_CMAKE_CASADI_CXX_FLAG}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON_LIB}"
     891@COMPILE_WITH_IPOPT_TRUE@   make -f Makefile  "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)" "CASADI_PYTHON_INST_DIR=${CASADI_PYTHON_INST_DIR}" "CASADI_INST_DIR=${CASADI_INST_DIR}" "CASADI_PLUGIN_INST_DIR=${CASADI_PLUGIN_INST_DIR}" "CMAKE_CASADI_ARGS=${CMAKE_CASADI_ARGS}" "CMAKE_CASADI_COMPILER_ARGS=${CMAKE_CASADI_COMPILER_ARGS}" "CMAKE_CASADI_CXX_FLAG=${CMAKE_CASADI_CXX_FLAG}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON_LIB}"
    914892@COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    915893@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
     
    921899install_casadi: casadi
    922900@COMPILE_WITH_IPOPT_TRUE@   cd $(abs_builddir)/ThirdParty/CasADi; \
    923 @COMPILE_WITH_IPOPT_TRUE@   make -f Makefile install "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
     901@COMPILE_WITH_IPOPT_TRUE@   make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
    924902@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(DESTDIR)$(prefix)/Python/
    925 @COMPILE_WITH_IPOPT_TRUE@   cp -r $(TMP_CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
    926 @COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
     903@COMPILE_WITH_IPOPT_TRUE@   cp -r $(CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
     904@COMPILE_WITH_IPOPT_TRUE@   cp $(CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
    927905@COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    928906@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); 
    929907@COMPILE_WITH_IPOPT64_TRUE@ cd $(abs_builddir)/ThirdParty/CasADi; \
    930 @COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
     908@COMPILE_WITH_IPOPT64_TRUE@ make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
    931909@COMPILE_WITH_IPOPT64_TRUE@ mkdir -p $(DESTDIR)$(prefix)/Python/
    932910@COMPILE_WITH_IPOPT64_TRUE@ cp -r $(CASADI_PYTHON_INST_DIR64)/casadi $(DESTDIR)$(prefix)/Python_64/
     
    937915casadi_interface: install_casadi_interface
    938916build_casadi_interface: casadi modelicacasadi_wrapper
    939 install_casadi_interface: install_casadi $(TMP_MC_LIB) $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/modelica_casadi_transfer_wrapper.py
     917install_casadi_interface: install_casadi $(MC_LIB) $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/modelica_casadi_transfer_wrapper.py
    940918    if [ "$(INSTALL_EXTRA_CASADI)" ]; then exec "$(INSTALL_EXTRA_CASADI)" "$(abs_top_srcdir)" "$(DESTDIR)$(prefix)"; fi
    941919
    942920ifcasadi: casadi
    943 @COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(TMP_MC_BUILD)/ifcasadi; \
    944 @COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/ifcasadi; \
     921@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(MC_BUILD)/ifcasadi; \
     922@COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/ifcasadi; \
    945923@COMPILE_WITH_IPOPT_TRUE@   case $(build) in \
    946924@COMPILE_WITH_IPOPT_TRUE@   *-cygwin*|*-mingw*) \
    947 @COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG)" \
    948 @COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
     925@COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" \
     926@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
    949927@COMPILE_WITH_IPOPT_TRUE@   *) \
    950928@COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_SRC_SWIG) \
    951 @COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
     929@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
    952930@COMPILE_WITH_IPOPT_TRUE@   esac
    953 @COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/ifcasadi;  make
     931@COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/ifcasadi;  make
    954932@COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}";
    955933@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME);
     
    962940@COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
    963941
    964 $(TMP_MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
    965 @COMPILE_WITH_IPOPT_TRUE@   rm -rf $(TMP_MC_LIB)
    966 @COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(TMP_MC_LIB)
    967 @COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(TMP_MC_LIB)
    968 @COMPILE_WITH_IPOPT_TRUE@   cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(TMP_MC_LIB)
    969 @COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/util.jar $(TMP_MC_LIB)
     942$(MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
     943@COMPILE_WITH_IPOPT_TRUE@   rm -rf $(MC_LIB)
     944@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(MC_LIB)
     945@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(MC_LIB)
     946@COMPILE_WITH_IPOPT_TRUE@   cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_LIB)
     947@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_CASADI_BUILD)/bin/util.jar $(MC_LIB)
    970948@COMPILE_WITH_IPOPT_TRUE@   case $(build) in \
    971949@COMPILE_WITH_IPOPT_TRUE@   *-cygwin*) \
    972 @COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
     950@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
    973951@COMPILE_WITH_IPOPT_TRUE@   *-mingw*) \
    974 @COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
     952@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
    975953@COMPILE_WITH_IPOPT_TRUE@   *) \
    976 @COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/ifcasadi/libifcasadi.so $(TMP_MC_LIB) ;; \
     954@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/ifcasadi/libifcasadi.so $(MC_LIB) ;; \
    977955@COMPILE_WITH_IPOPT_TRUE@   esac
    978956@COMPILE_WITH_IPOPT64_TRUE@ rm -rf $(MC_LIB64)
     
    999977$(OC_CASADI_BUILD)/bin/separateProcess.jar:  mc_optimica
    1000978
    1001 $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
    1002 
    1003 modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(TMP_MC_LIB)
    1004 @COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
    1005 @COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
     979$(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
     980
     981modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(MC_LIB)
     982@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(MC_BUILD)/modelicacasadi_wrapper; \
     983@COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/modelicacasadi_wrapper; \
    1006984@COMPILE_WITH_IPOPT_TRUE@   case $(build) in \
    1007985@COMPILE_WITH_IPOPT_TRUE@   *-cygwin*|*-mingw*) \
    1008 @COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG)" \
    1009 @COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
     986@COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" \
     987@COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
    1010988@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
    1011989@COMPILE_WITH_IPOPT_TRUE@       "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
    1012990@COMPILE_WITH_IPOPT_TRUE@   *) \
    1013991@COMPILE_WITH_IPOPT_TRUE@   cmake $(MC_INTERFACE) \
    1014 @COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
     992@COMPILE_WITH_IPOPT_TRUE@       -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
    1015993@COMPILE_WITH_IPOPT_TRUE@       -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
    1016994@COMPILE_WITH_IPOPT_TRUE@       "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
    1017995@COMPILE_WITH_IPOPT_TRUE@   esac
    1018 @COMPILE_WITH_IPOPT_TRUE@   cd $(TMP_MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
     996@COMPILE_WITH_IPOPT_TRUE@   cd $(MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
    1019997@COMPILE_WITH_IPOPT64_TRUE@ export PATH=$(PYTHON64_HOME):$(PYTHON64_HOME)/Scripts:$(PYTHON64_HOME)/Lib:"${PATH}"; \
    1020998@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(PYTHON64_HOME); \
     
    10341012 $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py: install_modelicacasadi_wrapper
    10351013
    1036  install_modelicacasadi_wrapper: $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
     1014 install_modelicacasadi_wrapper: $(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
    10371015@COMPILE_WITH_IPOPT_TRUE@   mkdir -p $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
    1038 @COMPILE_WITH_IPOPT_TRUE@   cp $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
     1016@COMPILE_WITH_IPOPT_TRUE@   cp $(MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
    10391017@COMPILE_WITH_IPOPT_TRUE@   rm -f $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
    10401018@COMPILE_WITH_IPOPT_TRUE@   touch $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
     
    10631041
    10641042clean-casadi-interface:
    1065     rm -rf $(TMP_MC_BUILD)
     1043    rm -rf $(MC_BUILD)
    10661044    rm -rf $(MC_BUILD64)
    10671045#   rm -rf $(DESTDIR)$(prefix)/Python/casadi
  • trunk/MakefileCasadi.am

    r14056 r14127  
    5050CMAKE_CASADI_COMPILER_ARGS64=-m64 -fpermissive
    5151
    52 if BUILD_WITH_PYTHON32
    53 TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)
    54 TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)
    55 TMP_CMAKE_CASADI_CXX_FLAG=$(CMAKE_CASADI_CXX_FLAG)
    56 TMP_CMAKE_CASADI_ARGS=$(CMAKE_CASADI_ARGS)
    57 TMP_CMAKE_CASADI_COMPILER_ARGS=$(CMAKE_CASADI_COMPILER_ARGS)
    58 
    59 TMP_CASADI_INST_DIR=$(CASADI_INST_DIR)
    60 TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR)
    61 TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR)
    62 TMP_MC_LIB=$(MC_LIB)
    63 TMP_MC_BUILD=$(MC_BUILD)
    64 
    65 else
    66 TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)
    67 TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)
    68 TMP_CMAKE_CASADI_CXX_FLAG=$(CMAKE_CASADI_CXX_FLAG64)
    69 TMP_CMAKE_CASADI_COMPILER_ARGS=$(CMAKE_CASADI_COMPILER_ARGS64)
    70 
    71 # note we set directories to those without 64bit suffix
    72 TMP_CASADI_INST_DIR=$(CASADI_INST_DIR)
    73 TMP_CASADI_PLUGIN_INST_DIR=$(CASADI_PLUGIN_INST_DIR)
    74 TMP_CASADI_PYTHON_INST_DIR=$(CASADI_PYTHON_INST_DIR)
    75 TMP_MC_LIB=$(MC_LIB64)
    76 TMP_MC_BUILD=$(MC_BUILD64)
    77 TMP_CMAKE_CASADI_ARGS=$(CMAKE_CASADI_ARGS64)
    78 endif
    79 
    80 
    8152.PHONY: modelicacasadi_wrapper ifcasadi install_modelicacasadi_transfer install_modelicacasadi_wrapper
    8253
     
    8455if COMPILE_WITH_IPOPT
    8556    cd $(abs_builddir)/ThirdParty/CasADi; \
    86     make -f Makefile  "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)" "CASADI_PYTHON_INST_DIR=${TMP_CASADI_PYTHON_INST_DIR}" "CASADI_INST_DIR=${TMP_CASADI_INST_DIR}" "CASADI_PLUGIN_INST_DIR=${TMP_CASADI_PLUGIN_INST_DIR}" "CMAKE_CASADI_ARGS=${TMP_CMAKE_CASADI_ARGS}" "CMAKE_CASADI_COMPILER_ARGS=${TMP_CMAKE_CASADI_COMPILER_ARGS}" "CMAKE_CASADI_CXX_FLAG=${TMP_CMAKE_CASADI_CXX_FLAG}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON_LIB}"
     57    make -f Makefile  "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)" "CASADI_PYTHON_INST_DIR=${CASADI_PYTHON_INST_DIR}" "CASADI_INST_DIR=${CASADI_INST_DIR}" "CASADI_PLUGIN_INST_DIR=${CASADI_PLUGIN_INST_DIR}" "CMAKE_CASADI_ARGS=${CMAKE_CASADI_ARGS}" "CMAKE_CASADI_COMPILER_ARGS=${CMAKE_CASADI_COMPILER_ARGS}" "CMAKE_CASADI_CXX_FLAG=${CMAKE_CASADI_CXX_FLAG}" "CMAKE_PYTHON_LIB=${CMAKE_PYTHON_LIB}"
    8758endif
    8859if COMPILE_WITH_IPOPT64
     
    9869if COMPILE_WITH_IPOPT
    9970    cd $(abs_builddir)/ThirdParty/CasADi; \
    100     make -f Makefile install "SWIGCHECK_BUILD_DIR=$(TMP_SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(TMP_CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
     71    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR)" "IPOPT_HOME=$(IPOPT_HOME)"
    10172    mkdir -p $(DESTDIR)$(prefix)/Python/
    102     cp -r $(TMP_CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
     73    cp -r $(CASADI_PYTHON_INST_DIR)/casadi $(DESTDIR)$(prefix)/Python/
    10374    ## temp fix
    104     cp $(TMP_CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
     75    cp $(CASADI_BUILD_DIR)/swig/casadi_core.py $(DESTDIR)$(prefix)/Python/casadi
    10576endif
    10677if COMPILE_WITH_IPOPT64 
     
    10879    export PYTHONHOME=$(PYTHON64_HOME); 
    10980    cd $(abs_builddir)/ThirdParty/CasADi; \
    110     make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
     81    make -f Makefile install "SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR)" "CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)" "IPOPT_HOME=$(IPOPT64_HOME)"
    11182    mkdir -p $(DESTDIR)$(prefix)/Python/
    11283    cp -r $(CASADI_PYTHON_INST_DIR64)/casadi $(DESTDIR)$(prefix)/Python_64/
     
    11990casadi_interface: install_casadi_interface
    12091build_casadi_interface: casadi modelicacasadi_wrapper
    121 install_casadi_interface: install_casadi $(TMP_MC_LIB) $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/modelica_casadi_transfer_wrapper.py
     92install_casadi_interface: install_casadi $(MC_LIB) $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py $(DESTDIR)$(prefix)/Python/modelicacasadi_transfer/modelica_casadi_transfer_wrapper.py
    12293    if [ "$(INSTALL_EXTRA_CASADI)" ]; then exec "$(INSTALL_EXTRA_CASADI)" "$(abs_top_srcdir)" "$(DESTDIR)$(prefix)"; fi
    12394
    12495ifcasadi: casadi
    12596if COMPILE_WITH_IPOPT
    126     mkdir -p $(TMP_MC_BUILD)/ifcasadi; \
    127     cd $(TMP_MC_BUILD)/ifcasadi; \
     97    mkdir -p $(MC_BUILD)/ifcasadi; \
     98    cd $(MC_BUILD)/ifcasadi; \
    12899    case $(build) in \
    129100    *-cygwin*|*-mingw*) \
    130     cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG)" \
    131         -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
     101    cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" \
     102        -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
    132103    *) \
    133104    cmake $(MC_SRC_SWIG) \
    134         -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
     105        -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)";; \
    135106    esac
    136     cd $(TMP_MC_BUILD)/ifcasadi;  make
     107    cd $(MC_BUILD)/ifcasadi;  make
    137108endif
    138109if COMPILE_WITH_IPOPT64
     
    148119endif
    149120
    150 $(TMP_MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
    151 if COMPILE_WITH_IPOPT
    152     rm -rf $(TMP_MC_LIB)
    153     mkdir -p $(TMP_MC_LIB)
    154     cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(TMP_MC_LIB)
    155     cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(TMP_MC_LIB)
    156     cp $(MC_CASADI_BUILD)/bin/util.jar $(TMP_MC_LIB)
     121$(MC_LIB): $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi
     122if COMPILE_WITH_IPOPT
     123    rm -rf $(MC_LIB)
     124    mkdir -p $(MC_LIB)
     125    cp $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(MC_LIB)
     126    cp $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_LIB)
     127    cp $(MC_CASADI_BUILD)/bin/util.jar $(MC_LIB)
    157128    case $(build) in \
    158129    *-cygwin*) \
    159     cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
     130    cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
    160131    *-mingw*) \
    161     cp $(TMP_MC_BUILD)/ifcasadi/ifcasadi.dll $(TMP_MC_LIB) ;; \
     132    cp $(MC_BUILD)/ifcasadi/ifcasadi.dll $(MC_LIB) ;; \
    162133    *) \
    163     cp $(TMP_MC_BUILD)/ifcasadi/libifcasadi.so $(TMP_MC_LIB) ;; \
     134    cp $(MC_BUILD)/ifcasadi/libifcasadi.so $(MC_LIB) ;; \
    164135    esac
    165136endif
     
    189160$(OC_CASADI_BUILD)/bin/separateProcess.jar:  mc_optimica
    190161
    191 $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
    192 
    193 
    194 modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(TMP_MC_LIB)
    195 if COMPILE_WITH_IPOPT
    196     mkdir -p $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
    197     cd $(TMP_MC_BUILD)/modelicacasadi_wrapper; \
     162$(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py: modelicacasadi_wrapper
     163
     164
     165modelicacasadi_wrapper: $(MC_CASADI_BUILD)/bin/ModelicaCompiler.jar $(OC_CASADI_BUILD)/bin/OptimicaCompiler.jar $(MC_CASADI_BUILD)/bin/util.jar ifcasadi # $(MC_LIB)
     166if COMPILE_WITH_IPOPT
     167    mkdir -p $(MC_BUILD)/modelicacasadi_wrapper; \
     168    cd $(MC_BUILD)/modelicacasadi_wrapper; \
    198169    case $(build) in \
    199170    *-cygwin*|*-mingw*) \
    200     cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG)" \
    201         -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
     171    cmake $(MC_INTERFACE) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="-m32" -DCMAKE_CXX_FLAGS="-m32" \
     172        -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
    202173        -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
    203174        "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
    204175    *) \
    205176    cmake $(MC_INTERFACE) \
    206         -DMC_BUILD="$(TMP_MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)" \
     177        -DMC_BUILD="$(MC_BUILD)" -DIPOPT_HOME="$(IPOPT_HOME)" -DCASADI_BUILD_DIR="$(CASADI_BUILD_DIR)" \
    207178        -DIFCASADI_JAR_BASE="$(JAVA_CASADI_BUILD_DIR)" -DCASADI_HOME="$(CASADI_HOME)" \
    208179        "$(CMAKE_PYTHON_LIB)" "$(CMAKE_PYTHON_INCLUDE)" ;; \
    209180    esac
    210     cd $(TMP_MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
     181    cd $(MC_BUILD)/modelicacasadi_wrapper;  make modelicacasadi_wrapper
    211182endif
    212183if COMPILE_WITH_IPOPT64
     
    229200 $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py: install_modelicacasadi_wrapper
    230201 
    231  install_modelicacasadi_wrapper: $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
     202 install_modelicacasadi_wrapper: $(MC_BUILD)/modelicacasadi_wrapper/swig/modelicacasadi_wrapper.py
    232203if COMPILE_WITH_IPOPT
    233204    mkdir -p $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
    234     cp $(TMP_MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
     205    cp $(MC_BUILD)/modelicacasadi_wrapper/swig/*modelicacasadi_wrapper* $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper
    235206    rm -f $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
    236207    touch $(DESTDIR)$(prefix)/Python/modelicacasadi_wrapper/__init__.py
     
    266237       
    267238clean-casadi-interface:
    268     rm -rf $(TMP_MC_BUILD)
     239    rm -rf $(MC_BUILD)
    269240    rm -rf $(MC_BUILD64)
    270241#   rm -rf $(DESTDIR)$(prefix)/Python/casadi
  • trunk/ModelicaCasADiInterface/src/utils.cpp

    r14056 r14127  
    2323#include "java/lang/String.h"
    2424#include <string>
     25#include <cstring>
    2526#include "JCCEnv.h"
    2627
    27 #include "Utils.hpp"
     28#include "utils.hpp"
     29using namespace std;
    2830
    2931char *jobjectoToString(jobject obj)
  • trunk/external/build_externals/Jenkins/ci/vars/buildAssimulo.groovy

    r14091 r14127  
    3131            cd \${JM_HOME}/external/build_externals/build/assimulo
    3232           
    33             make clean USER_CONFIG=${USER_CONFIG} BUILD_DIR=\${JENKINS_BUILD_DIR} INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}
     33            make clean USER_CONFIG=${USER_CONFIG}${bit} BUILD_DIR=\${JENKINS_BUILD_DIR} INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}
    3434            make ${TARGET} USER_CONFIG=${USER_CONFIG}${bit} JM_HOME=\${JM_HOME} BUILD_DIR=\${JENKINS_BUILD_DIR} WORKSPACE=\${JM_HOME}/.. INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}
    3535            """, extra_bat);
  • trunk/external/build_externals/Jenkins/ci/vars/buildAssimuloDocker.groovy

    r14091 r14127  
    1 def call(PLATFORM, TARGET, USER_CONFIG) {
     1def call(PLATFORM, TARGET, USER_CONFIG, ASSIMULO_VERSION) {
    22    stage("Assimulo ${TARGET} ${PLATFORM}") {
    33       
    44        def ARTIFACT_FILE="${WORKSPACE}/JModelica/artifacts_assimulo"
    55        def MAKE_ARGS="JM_HOME=${WORKSPACE}/JModelica PATH_TO_MOUNT=${WORKSPACE}/JModelica USER_CONFIG=${USER_CONFIG} ARTIFACT_FILE=${ARTIFACT_FILE}"
    6        
     6        def artifact_pattern = ""
    77        dir ('JModelica/external/build_externals/docker/src/components/Assimulo') {
    88            try{
     
    1111                dir("${WORKSPACE}/JModelica") {
    1212                    artifact_list = sh returnStdout: true, script: "cat ${ARTIFACT_FILE}"
     13                    if (TARGET == "wheel") {
     14                        // need to remove the trailing **\n from the string and append *.whl
     15                        artifact_pattern = artifact_list.replace("*", "")
     16                        artifact_pattern = artifact_pattern.replace("\n", "")
     17                        artifact_pattern = artifact_pattern + "*.whl"
     18                        echo "artifact_pattern = ${artifact_pattern}"
     19                        uploadToArtifactory(artifact_pattern, "externals/assimulo/release/${ASSIMULO_VERSION}/unix/${PLATFORM}/", false, "true")
     20                    }
    1321                    archiveArtifacts artifacts: artifact_list, fingerprint: false
    1422                    sh "rm ${ARTIFACT_FILE}"
     
    1725            } finally {
    1826                sh "make clean_in_docker ${MAKE_ARGS}"
     27                if (TARGET == "wheel") {
     28                    try {
     29                        dir ("${WORKSPACE}/JModelica") {
     30                            sh "rm -rfv ${artifact_pattern}"   
     31                        }
     32                    } catch (Exception e) {
     33                        sh "DEBUG: Could not remove ${WORKSPACE}/JModelica/${artifact_pattern}"
     34                    }
     35                }
    1936            }
    2037        }
  • trunk/external/build_externals/build/assimulo/makefile

    r14091 r14127  
    1515    nosetests $(ASSIMULO_FOLDER_INSTALL_DIR)/tests/*.pyc $(ASSIMULO_FOLDER_INSTALL_DIR)/tests/solvers/*.pyc
    1616
    17 folder: $(PREINSTALL_DIR) debug_var
     17folder: $(PREINSTALL_DIR)
    1818
    19 debug_var:
    20     ls -la $(PREINSTALL_DIR)
    2119
    2220$(PREINSTALL_DIR):
     
    4745    cd $(TARGET_BUILD_DIR); \
    4846    $(PYTHONHOME)python setup.py $(BUILD_SETUP_EXTRA) bdist_wheel --superlu-home=$(SUPERLU_HOME) --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(BLAS_HOME) --lapack-home=$(LAPACK_HOME) --mkl-home=$(MKL_HOME) $(EXTRA_SETUP_ARGS); \
    49     find -type f -name Assimulo*.whl -exec cp {} $@/ \;
     47    find -type f -name Assimulo*$(BITNESS).whl -exec cp {} $@/ \;
    5048
    5149clean:
Note: See TracChangeset for help on using the changeset viewer.