Skip to content

Commit a0cb54d

Browse files
AnHeuermannAnHeuermann
authored
Revert basemodelica.jl import (#225)
- Revert a7eaa7c - Revert f86915d
1 parent f86915d commit a0cb54d

21 files changed

+18
-2948
lines changed

‎.CI/Jenkinsfile‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@ pipeline {
1919
booleanParam(name: 'newInst_newBackend', defaultValue: false, description: 'master branch, -d=newInst --newBackend, (ryzen-5950x-1)')
2020
booleanParam(name: 'oldInst', defaultValue: false, description: 'master branch, with -d=nonewInst (ryzen-5950x-2)')
2121

22-
booleanParam(name: 'cpp_v1_24', defaultValue: false, description: 'maintenance/v1.24 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
22+
booleanParam(name: 'cpp_v1_24', defaultValue: false, description: 'maintenance/v1.24 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
2323
booleanParam(name: 'cpp_v1_25', defaultValue: false, description: 'maintenance/v1.25 branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
2424
booleanParam(name: 'cpp', defaultValue: false, description: 'master branch, with --simCodeTarget=Cpp (ryzen-5950x-2).')
2525
booleanParam(name: 'report_ryzen_5950x_1', defaultValue: false, description: 'Generate a report for ryzen-5950x-1 without running the tests')
2626
booleanParam(name: 'report_ryzen_5950x_2', defaultValue: false, description: 'Generate a report for ryzen-5950x-2 without running the tests')
2727

28-
booleanParam(name: 'basemodelica_jl_master', defaultValue: false, description: 'OpenModelica master branch with BaseModelica export and BaseModelica.jl import (ryzen-5950x-1)')
29-
3028
booleanParam(name: 'conversion_script', defaultValue: false, description: 'master branch with conversion script from MSL 3 to 4 (ryzen-5950x-1). This is an experimental job that does not run on a fixed schedule.')
3129
booleanParam(name: 'cvode', defaultValue: false, description: 'master branch, with -d=newInst and -s cvode (ryzen-5950x-2). This is an experimental job that does not run on a fixed schedule.')
3230
booleanParam(name: 'gbode', defaultValue: false, description: 'master branch, with -d=newInst and -s gbode (ryzen-5950x-2). This is an experimental job that does not run on a fixed schedule.')
@@ -222,24 +220,6 @@ pipeline {
222220
runRegressiontest('master', 'master-fmi-fmpy', '', 'origin/master', 'ripper2', 'LibraryTestingRipper2DB', false, '', false, false)
223221
}
224222
}
225-
226-
stage('master BaseModelica.jl import') {
227-
agent {
228-
node {
229-
label 'ryzen-5950x-1'
230-
customWorkspace 'ws/OpenModelicaLibraryTestingWork'
231-
}
232-
}
233-
options { skipDefaultCheckout() }
234-
when {
235-
beforeAgent true
236-
expression { params.basemodelica_jl_master }
237-
}
238-
steps {
239-
runRegressiontest('master', 'basemodelica_jl_master', '--basemodelica-mtk-import', 'origin/master', 'ripper1', 'LibraryTestingRipper1DB', false, '', false, false)
240-
}
241-
}
242-
243223
stage('newInst-daeMode') {
244224
agent {
245225
node {
@@ -601,7 +581,6 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
601581
fi
602582
'''
603583
FMI_TESTING_FLAG=""
604-
JULIA_TESTTING_FLAG=""
605584
if (!name.contains('fmpy') && omsHash) {
606585
sh """
607586
if ! test -d OMSimulator; then
@@ -636,7 +615,7 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
636615
"""
637616
FMI_TESTING_FLAG="--fmi=true --fmisimulator=${env.HOME}/saved_omc/OMSimulator/install/bin/OMSimulator --default=ulimitExe=50"
638617
}
639-
618+
640619
if (name.contains('fmpy')) {
641620
sh """
642621
# update fmpy
@@ -646,13 +625,6 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
646625
FMI_TESTING_FLAG="--fmi=true --fmisimulator='python3 -m fmpy' --default=ulimitExe=50"
647626
}
648627

649-
if (name.contains('basemodelica-mtk-import')) {
650-
sh """
651-
julia --project=TestBaseModelica -e 'import Pkg; Pkg.build(verbose=true); Pkg.precompile()'
652-
"""
653-
JULIA_TESTTING_FLAG="--basemodelica-mtk-import --extraflags=\"setCommandLineOptions(\\\"--baseModelica\\\");\""
654-
}
655-
656628
OMCPATH = "${omcompiler ? '../' : './'}OMCompiler"
657629

658630
sh '''
@@ -802,7 +774,7 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
802774
803775
cd OpenModelicaLibraryTesting
804776
# Force /usr/bin/omc as being used for generating the mos-files. Ensures consistent behavior among all tested OMC versions
805-
stdbuf -oL -eL time ./test.py --ompython_omhome=/usr ${FMI_TESTING_FLAG} ${JULIA_TESTTING_FLAG} --extraflags='${extraFlags}' --extrasimflags='${extrasimflags}' --branch="${name}" --output="libraries.openmodelica.org:/var/www/libraries.openmodelica.org/branches/${name}/" --libraries='${libraryPath}/.openmodelica/libraries/' --jobs=${jobs} ${libs_config_file} ${params.OLDLIBS ? "configs/conf-old.json configs/conf-nonstandard.json" : ""} || (killall omc ; false) || exit 1
777+
stdbuf -oL -eL time ./test.py --ompython_omhome=/usr ${FMI_TESTING_FLAG} --extraflags='${extraFlags}' --extrasimflags='${extrasimflags}' --branch="${name}" --output="libraries.openmodelica.org:/var/www/libraries.openmodelica.org/branches/${name}/" --libraries='${libraryPath}/.openmodelica/libraries/' --jobs=${jobs} ${libs_config_file} ${params.OLDLIBS ? "configs/conf-old.json configs/conf-nonstandard.json" : ""} || (killall omc ; false) || exit 1
806778
"""
807779
sh 'date'
808780
sh "rm -f OpenModelicaLibraryTesting/${dbPrefix}-sqlite3.db.tmp"
@@ -811,5 +783,5 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
811783
sh "cp OpenModelicaLibraryTesting/sqlite3.db ~/TEST_LIBS_BACKUP/${dbPrefix}-sqlite3.db"
812784
sh "rm -f ~/TEST_LIBS_BACKUP/${dbPrefix}-`date +sqlite3.%Y%m%d.db`"
813785

814-
sshPublisher(publishers: [sshPublisherDesc(configName: sshConfig, transfers: [sshTransfer(removePrefix: 'OpenModelicaLibraryTesting', sourceFiles: 'OpenModelicaLibraryTesting/sqlite3.db')])], failOnError: true)
786+
sshPublisher(publishers: [sshPublisherDesc(configName: sshConfig, transfers: [sshTransfer(removePrefix: 'OpenModelicaLibraryTesting', sourceFiles: 'OpenModelicaLibraryTesting/sqlite3.db')])], failOnError: true)
815787
}

‎.github/workflows/test.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
with:
5050
python-version: ${{ matrix.python-version }}
5151
cache: 'pip' # caching pip dependencies
52-
5352
- name: Install Python dependencies
5453
shell: bash
5554
run: |

‎.github/workflows/test_julia.yml‎

Lines changed: 0 additions & 108 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
__pycache__
22
!HelloWorld.mo
33
!HelloWorld.mos
4-
/.venv/
5-
/.vscode/
64
/*.files
75
/*.html
86
/*.json

‎README.md‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,17 +175,3 @@ export MSLREFERENCE="/some/path/to/ReferenceFiles/"
175175
```
176176
177177
For the other libraries just clone the repositories to `/some/path/to/ReferenceFiles/`.
178-
179-
## Examples
180-
181-
### BaseModelica export and BaseModelica.jl import
182-
183-
```bash
184-
export MY_SANITY_CHECK_DIRECTORY=sanityCheck
185-
./test.py --basemodelica-mtk-import --branch=master --noclean --verbose configs/sanityCheck.json
186-
./report.py --branches="${{ matrix.omc-version }}" configs/sanityCheck.json
187-
```
188-
189-
This will create a Julia system image to speedup tests. This can take a lot of
190-
time, but will reduce the Julia startup penalty. To disable add
191-
`--no-julia-sys-image`.

0 commit comments

Comments
 (0)