additional fixes

cpp-lln-lab · Jul 24, 2024 · 81529f0 · 81529f0
1 parent 7e51908
commit 81529f0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -149,7 +149,7 @@ jobs:
                       -v /tmp/workspace/data/ds000001:/bids_dataset \
                       -v /home/circleci/outputs:/outputs \
                         << parameters.dh_orga >>/<< parameters.dh_repo >> \
-                          /outputs/ds000001 \
+                          /bids_dataset \
                           /outputs/ds000001 \
                           dataset \
                           create_roi \

diff --git a/demos/MoAE/test_moae.m b/demos/MoAE/test_moae.m
@@ -31,17 +31,18 @@
 
 optionsFile = fullfile(WD, 'options', 'options_task-auditory.json');
 
-space = {'individual'
+space = {
          'IXI549Space'
+         'individual'
          'IXI549Space'
          'individual'};
-ignore = {{'unwarp'}
-          {'unwarp', 'qa'}
+ignore = {{'unwarp', 'qa'}
+          {'unwarp'}
           {''}
           {''}};
-
-models = {fullfile(WD, 'models', 'model-MoAEindividual_smdl.json')
+models = {
           fullfile(WD, 'models', 'model-MoAE_smdl.json')
+          fullfile(WD, 'models', 'model-MoAEindividual_smdl.json')
           fullfile(WD, 'models', 'model-MoAE_smdl.json')
           fullfile(WD, 'models', 'model-MoAEindividual_smdl.json')};
 
@@ -65,14 +66,16 @@
   %% stats
   preproc_dir = fullfile(output_dir, 'bidspm-preproc');
 
-  % only specify the subject level model
-  bidspm(bids_dir, output_dir, 'subject', ...
-         'participant_label', {'01'}, ...
-         'action', 'stats', ...
-         'preproc_dir', preproc_dir, ...
-         'model_file', models{iOption}, ...
-         'options', optionsFile, ...
-         'design_only', true);
+  if ~bids.internal.is_octave() && ~ispc()
+    % only specify the subject level model
+    bidspm(bids_dir, output_dir, 'subject', ...
+           'participant_label', {'01'}, ...
+           'action', 'stats', ...
+           'preproc_dir', preproc_dir, ...
+           'model_file', models{iOption}, ...
+           'options', optionsFile, ...
+           'design_only', true);
+  end
 
   % specify, estimate model and contrasts, and view results
   bidspm(bids_dir, output_dir, 'subject', ...

diff --git a/tests/tests_slow/tests_cli/test_bidspm_default_stats_model.m b/tests/tests_slow/tests_cli/test_bidspm_default_stats_model.m
@@ -21,7 +21,8 @@ function test_createDefaultStatsModel_CLI()
          'action', 'default_model', ...
          'task', {'vislocalizer', 'vismotion'}, ...
          'space', {'individual'}, ...
-         'verbosity', 0);
+         'verbosity', 0, ...
+         'skip_validation', true);
 
   % make sure the file was created where expected
   expectedFilename = fullfile(outputPath, 'derivatives', 'models', ...