Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
mdbnomics
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
DBnomics
mdbnomics
Commits
e0ee6dae
Commit
e0ee6dae
authored
4 years ago
by
Dóra Kocsis
Browse files
Options
Downloads
Patches
Plain Diff
bump minimal MATLAB version to R2015a, remove Octave test suite
parent
48b96dc1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#3554
failed
4 years ago
Stage: test
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+3
-3
3 additions, 3 deletions
.gitlab-ci.yml
Makefile
+2
-5
2 additions, 5 deletions
Makefile
src/initialize_mdbnomics.m
+2
-2
2 additions, 2 deletions
src/initialize_mdbnomics.m
src/utils/iter_filtered_series.m
+0
-1
0 additions, 1 deletion
src/utils/iter_filtered_series.m
with
7 additions
and
11 deletions
.gitlab-ci.yml
+
3
−
3
View file @
e0ee6dae
...
@@ -10,9 +10,9 @@ test_matlab:
...
@@ -10,9 +10,9 @@ test_matlab:
script
:
script
:
-
make check-matlab
-
make check-matlab
test_o
ctave
:
test_o
ld_matlab
:
stage
:
test
stage
:
test
variables
:
variables
:
OPENBLAS_NUM_THREADS
:
1
MATLAB
:
/usr/local/MATLAB/R2015a/bin/matlab
script
:
script
:
-
make check-octave
-
make check-matlab
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Makefile
+
2
−
5
View file @
e0ee6dae
OCTAVE
?=
octave-cli
MATLAB
?=
$(
shell which matlab
)
MATLAB
?=
$(
shell which matlab
)
all
:
check-matlab
m-unit-tests/src/mtest.m
:
m-unit-tests/src/mtest.m
:
git clone https://git.dynare.org/Dynare/m-unit-tests
git clone https://git.dynare.org/Dynare/m-unit-tests
check-octave
:
m-unit-tests/src/mtest.m
@
cd
tests
;
\
$(
OCTAVE
)
--no-init-file
--silent
--no-history
--eval
"addpath([pwd() '/../m-unit-tests/src']); runalltests"
&&
[
!
-f
./failed
]
&&
[
-f
./pass
]
check-matlab
:
m-unit-tests/src/mtest.m
check-matlab
:
m-unit-tests/src/mtest.m
@$(
MATLAB
)
-nosplash
-nodisplay
-r
"addpath([pwd '/m-unit-tests/src']); cd tests; runalltests; quit"
&&
[
!
-f
./tests/failed
]
&&
[
-f
./tests/pass
]
@$(
MATLAB
)
-nosplash
-nodisplay
-r
"addpath([pwd '/m-unit-tests/src']); cd tests; runalltests; quit"
&&
[
!
-f
./tests/failed
]
&&
[
-f
./tests/pass
]
...
...
This diff is collapsed.
Click to expand it.
src/initialize_mdbnomics.m
+
2
−
2
View file @
e0ee6dae
...
@@ -50,8 +50,8 @@ P = cellfun(@(c)[mdbnomics_src_root c], p, 'uni', false);
...
@@ -50,8 +50,8 @@ P = cellfun(@(c)[mdbnomics_src_root c], p, 'uni', false);
addpath
(
P
{:});
addpath
(
P
{:});
% Check minimal MATLAB and Octave requirements.
% Check minimal MATLAB and Octave requirements.
if
(
isoctave
&&
octave_ver_less_than
(
'6'
))
||
matlab_ver_less_than
(
'8.5'
)
if
matlab_ver_less_than
(
'8.5'
)
error
(
'The minimum MATLAB requirement of this package is R2015a
, and the minimum Octave requirement of this package is version 6
.'
);
error
(
'The minimum MATLAB requirement of this package is R2015a.'
);
end
end
assignin
(
'caller'
,
'mdbnomics_src_root'
,
mdbnomics_src_root
);
assignin
(
'caller'
,
'mdbnomics_src_root'
,
mdbnomics_src_root
);
This diff is collapsed.
Click to expand it.
src/utils/iter_filtered_series.m
+
0
−
1
View file @
e0ee6dae
...
@@ -58,7 +58,6 @@ for gg = 1:size(grouped_series, 2)
...
@@ -58,7 +58,6 @@ for gg = 1:size(grouped_series, 2)
posted_series_list
=
jsonencode
(
posted_series_list
);
posted_series_list
=
jsonencode
(
posted_series_list
);
end
end
posted_series_list
=
transform_json_request
(
posted_series_list
);
json_request
=
sprintf
(
'{"filters":%s,"series":%s}'
,
dbnomics_filters
,
posted_series_list
);
json_request
=
sprintf
(
'{"filters":%s,"series":%s}'
,
dbnomics_filters
,
posted_series_list
);
try
try
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment