Changeset 14103


Ignore:
Timestamp:
Nov 18, 2019 12:09:10 PM (3 weeks ago)
Author:
randersson
Message:

#5792 Merged trunk to stable

Location:
branches/stable
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • branches/stable

  • branches/stable/Compiler/ModelicaFrontEnd/src/jastadd/source/Library.jrag

    r13661 r14103  
    557557       
    558558        private LibraryDef(String name, String version, boolean structured, SrcLibNode.LoadReason reason, LoadInfo loadInfo) {
     559            assert !loadInfo.getPathAsPath().getFileName().toString().equals(SrcLibNode.PACKAGE_FILE);
    559560            this.name = name;
    560561            this.version = version;

  • branches/stable/Compiler/ModelicaMiddleEnd/src/jastadd/optimizations/AliasElimination.jrag

    r13504 r14103  
    294294        if (isAlias()) {
    295295            aliasVars.add(this);
    296         } else if (aliasSortKeep()) { 
     296        } else if (aliasSortKeep()) {
    297297            nonAliasVars.add(this);
     298            AliasManager.AliasSet aliasSet = aliasSet();
     299            if (isDiscrete() && myPreVariable().isUnknown() && aliasSet != null && aliasSet.hasPreVariable()) {
     300                nonAliasVars.add(createPreVariable());
     301            }
    298302            this.propagateAttributesFromAlias();
    299303        }

  • branches/stable/Compiler/ModelicaMiddleEnd/src/jastadd/optimizations/AliasVariables.jadd

    r12978 r14103  
    453453                return aliases.size();
    454454            }
     455           
     456            public boolean hasPreVariable() {
     457                for (AliasVariable v : this) {
     458                    if (!v.getFVariable().myPreVariable().isUnknown()) {
     459                        return true;
     460                    }
     461                }
     462                return false;
     463            }
    455464           
    456465            @Override

  • branches/stable/Python/src/pymodelica/compiler_wrappers.py

    r14067 r14103  
    2424from .compiler_interface import *
    2525from .compiler_logging import CompilerLogHandler, LogHandlerThread
    26 from pymodelica.common import python3_flag
    2726from pymodelica.common.core import list_to_string
    2827from .compiler_exceptions import *
    29 
     28from distutils.version import StrictVersion
     29jpype_jexception_compatibility = True if StrictVersion(jpype.__version__) >= '0.7.0' else False
    3030class ModelicaCompiler(object):
    3131    """
    … …  
    4040        Modelica models. A compiler instance can be used multiple times.
    4141        """
    42         self._java_exception = jpype.JException if python3_flag else jpype.JavaException
     42        self._java_exception = jpype.JException if jpype_jexception_compatibility else jpype.JavaException
    4343       
    4444        try:
    … …  
    523523            #  we need to compare the raised exception with the reference exception
    524524            #  in different ways.
    525             return type(raised_ex) is ref_ex if python3_flag else raised_ex.javaClass() is ref_ex
     525            return type(raised_ex) is ref_ex if jpype_jexception_compatibility else raised_ex.javaClass() is ref_ex
    526526
    527527        if _py_handle_exception(ex, CompilerException):

  • branches/stable/ThirdParty/build_thirdparties/Jenkins/ci/vars/buildThirdPartyFromMake.groovy

    r14067 r14103  
    1 def call(JM_CHECKOUT_PATH, JM_BRANCH, INSTALL_PATH, module,bitness=["32", "64"], stash=false, archive=true, target_suffix="") {
     1def call(JM_CHECKOUT_PATH, JM_BRANCH, INSTALL_PATH, module,bitness=["32", "64"], stash=false, archive=false, target_suffix="") {
    22    if (JM_CHECKOUT_PATH != null) {
    33        checkoutJM(${JM_BRANCH})

  • branches/stable/external/build_externals/Jenkins/ci/vars/buildAssimulo.groovy

    r14067 r14103  
    3131            cd \${JM_HOME}/external/build_externals/build/assimulo
    3232           
    33             make clean USER_CONFIG=${USER_CONFIG} BUILD_DIR=\${JENKINS_BUILD_DIR}
    34             make ${TARGET} USER_CONFIG=${USER_CONFIG} JM_HOME=\${JM_HOME} BUILD_DIR=\${JENKINS_BUILD_DIR} WORKSPACE=\${JM_HOME}/.. INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${msvs_suffix}
     33            make clean USER_CONFIG=${USER_CONFIG} BUILD_DIR=\${JENKINS_BUILD_DIR} INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}
     34            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);
    36             if ("${TARGET}" == "folder") {
     36            if ("${TARGET}" == "install") {
    3737                runMSYSWithEnv("""\
    3838                export JM_HOME="\$(pwd)/JModelica/"
    39                 nosetests ${INSTALL_PATH_UNIX}/assimulo/tests/*.py
     39                nosetests ${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}/assimulo/tests/*.py
    4040                """, "", false, bit);
    4141            }
    … …  
    4545                        stash includes: "Python_${bit}/**", name: "Python_${bit}_assimulo_${TARGET}"
    4646                    }
    47                     if (msvs_suffix == "msvs") {
    48                         archiveArtifacts artifacts: "${msvs_suffix}/assimulo/**", fingerprint: false
     47                    if (TARGET == "wheel") {
     48                        archiveArtifacts artifacts: "${bit}/${TARGET}/**", fingerprint: false
    4949                    } else {
    50                         archiveArtifacts artifacts: "assimulo/**", fingerprint: false
     50                        // archiving the entire directory
     51                        if (msvs_suffix == "msvs") {
     52                            archiveArtifacts artifacts: "${bit}${msvs_suffix}/assimulo/**", fingerprint: false
     53                        } else {
     54                            archiveArtifacts artifacts: "${bit}/assimulo/**", fingerprint: false
     55                        }
    5156                    }
    5257                }

  • branches/stable/external/build_externals/Jenkins/ci/vars/buildAssimuloDocker.groovy

    r14067 r14103  
    1414                    sh "rm ${ARTIFACT_FILE}"
    1515                }
    16                 //sh "make docker_test_${TARGET} ${MAKE_ARGS}"
     16                sh "make docker_test_${TARGET} ${MAKE_ARGS}"
    1717            } finally {
    1818                sh "make clean_in_docker ${MAKE_ARGS}"

  • branches/stable/external/build_externals/build/assimulo/makefile

    r14067 r14103  
    88    nosetests tests/*.pyc tests/solvers/*.pyc
    99
    10 test_wheel: $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)
    11     @pip install $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)/*.whl
     10test_wheel:
     11    @cd $(JM_HOME)/$(DISTRO)/$(TARGET)$(BITNESS)/$(subst test_,,$@) && pip install *.whl
    1212    nosetests $(WHEEL_INSTALL_DIR)/tests/*.pyc $(WHEEL_INSTALL_DIR)/tests/solvers/*.pyc
    1313
    14 test_folder: $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)
     14test_folder:
    1515    nosetests $(ASSIMULO_FOLDER_INSTALL_DIR)/tests/*.pyc $(ASSIMULO_FOLDER_INSTALL_DIR)/tests/solvers/*.pyc
    1616

  • branches/stable/external/build_externals/build/pyfmi/makefile

    r12145 r14103  
    99
    1010test_wheel: $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)
    11     @pip install $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)/*.whl
     11    @cd $(INSTALL_DIR_FOLDER)/$(subst test_,,$@) && pwd && ls -la && pip install *.whl
    1212    nosetests $(WHEEL_INSTALL_DIR)/tests/*.py
    1313

  • branches/stable/external/build_externals/configurations/Assimulo/windows/win64

    r14067 r14103  
    2626EXTRA_SETUP_ARGS=--no-msvcr=true --with_openmp=True
    2727
    28 INSTALL_DIR_FOLDER=${SDK_HOME}/install/Python_64
    2928SUPERLU_HOME=$(BUILD_DIR)/superlu_install64
    3029SUNDIALS_HOME=$(BUILD_DIR)/sundials_install64

  • branches/stable/external/build_externals/docker/src/components/PyFMI/jenkins_centos_config

    r12084 r14103  
    2929PYFMI_FOLDER_INSTALL_DIR=${JM_HOME}/${DISTRO}/pyfmi${BITNESS}/folder/pyfmi
    3030FMIL_INSTALL=${JM_HOME}/${DISTRO}/${TARGET}${BITNESS}/fmil_install
     31INSTALL_DIR_FOLDER=${JM_HOME}/${DISTRO}/${TARGET}${BITNESS}

  • branches/stable/external/build_externals/docker/src/components/PyFMI/jenkins_ubuntu_config

    r12084 r14103  
    2929PYFMI_FOLDER_INSTALL_DIR=${JM_HOME}/${DISTRO}/pyfmi${BITNESS}/folder/pyfmi
    3030FMIL_INSTALL=${JM_HOME}/${DISTRO}/${TARGET}${BITNESS}/fmil_install
     31INSTALL_DIR_FOLDER=${JM_HOME}/${DISTRO}/${TARGET}${BITNESS}
Note: See TracChangeset for help on using the changeset viewer.