Skip to content

PR161 + review - #163

Merged
jooh merged 55 commits into
automaticanalysis:masterfrom
tiborauer:jooh
Sep 17, 2018
Merged

PR161 + review#163
jooh merged 55 commits into
automaticanalysis:masterfrom
tiborauer:jooh

Conversation

@tiborauer

Copy link
Copy Markdown
Member

This PR contains @jooh's PR (#161), plus the commits of its review. I have tested it both at the RHUL and at the CBSU.
The main modifications are:

  • Scenarios (parametersets, demo download and execution) have been redesigned considering user without write access to the (centrally installed) aa folder
  • Parametersets are defined interactively (dialogues instead of questions in the command line)
  • Demo dataset is now downloaded from OSF.
  • BIDS demo is also downloaded from OSF.
  • The examples have been reworked to use segment8. They have been all tested for execution and for results.

If @jooh and others agree, then this PR can be merged instead of #161.
(I am sorry for the confusion! I am sure there must be a more elegant way, but PR to @jooh's repo did not work, because some of my commits were not detected).

jooh added 30 commits July 26, 2018 14:24
Conflicts:
	aa_recipes_and_parametersets/aap_parameters_defaults_CBSU.xml
…input in place of ROIfile setting for greater flexibility, update MTI example
1. aarecipe now creates a new seed aap_parameters_user.xml file if no
defaults file is specified. This put user-specific configuration outside of
version control (where it should be).

2. The example scripts all call aarecipe without a defaults file, so
that the above functionality makes it possible to run tests regardless
of site (as long as the data is publicly available).

3. aa_test/aatest - new test function for running tests on the above
examples in an automated manner.

4. Re-organised the examples directory for clarity and to make it
possible to run particular test flavours (e.g., all CBU-specific tests
are under the cbu folder). Added light-weight documentation for this.

5. Big tidy up of legacy examples.

6. Relocated the task lists to the examples directory, and renamed to
always match the user script it goes with. Renamed
aa_recipes_and_parametersets aa_parametersets to reflect this change
(this directory only contains defaults now).
@tiborauer

Copy link
Copy Markdown
Member Author

I do the same (demo and BIDS) here, at the RHUL.

@tiborauer

Copy link
Copy Markdown
Member Author

All went well on my end.

@jooh

jooh commented Aug 30, 2018

Copy link
Copy Markdown
Collaborator

aa_user_diffusion crashes for me during aamod_diffusion_rois_dartel_denormDKI. I am a little stumped here. regstreams is defined as inptstreams(1:end-3), which means it is what? Then we iterate over that and drop any where aas_stream_hascontents returns zero. And we end up with nothing. I don't really understand what this code is trying to achieve. Can you reproduce the error? I think it's something to do with the ROI input stream.

        imreslice{1} = aas_getfiles_bystream_multilevel(aap,domain,[subj sess],regstreams{end});
Error in aa_feval (line 15)
    [varargout{:}]=feval(funcname,varargin{:});
Error in aa_feval_withindices (line 4)
[aap,resp]=aa_feval(mfile_alias,aap,task,ci{:});
Error in aa_doprocessing_onetask (line 185)
            [aap,resp]=aa_feval_withindices(mfile_alias,aap,task,indices);
Error in aaq_qsub_debug (line 42)
                aa_doprocessing_onetask(obj.pool.Jobs(eii).Tasks.InputArguments{:}) 
87          imreslice{1} = aas_getfiles_bystream_multilevel(aap,domain,[subj sess],regstreams{end});

@tiborauer

Copy link
Copy Markdown
Member Author

I have found the issue and debugged it. Try again, please!

@jooh

jooh commented Aug 30, 2018

Copy link
Copy Markdown
Collaborator

Thanks, that seems to have done the trick.

@tiborauer

Copy link
Copy Markdown
Member Author

Shall we merge, then?

@jooh

jooh commented Sep 3, 2018

Copy link
Copy Markdown
Collaborator

Still running through the tests. I accidentally tested the wrong version so having to rerun a few things.. Stay tuned.

@jpeelle

jpeelle commented Sep 4, 2018 via email

Copy link
Copy Markdown
Member

@jooh

jooh commented Sep 11, 2018

Copy link
Copy Markdown
Collaborator

Now we crash on aa_user_freesurfer (old aa_user_FS), which is trying to define subjects with a 1-argument approach and crashes on undefined varargin{2}. Do we still support this call syntax? Maybe we need to set directory_conventions.

aap = aas_addsubject(aap,90952);

@tiborauer

Copy link
Copy Markdown
Member Author

I have updated the example script.

@jones-michael-s

Copy link
Copy Markdown
Collaborator

aa_init lines 77-79:

clear ft_defaults
clear global ft_default
ft_defaults;

This code worked fine for us under previous versions of Matlab.

Under R2018a, it crashes on line 79.

This feels like a typo. On the other hand, it's related to fieldtrip initialization and we don't use fieldtrip.

@tiborauer

Copy link
Copy Markdown
Member Author

Are you sure it is the MATLAB version? I am using 2018a in multiple places without issue.

@jones-michael-s

Copy link
Copy Markdown
Collaborator

I'll doublecheck (might be a mac/linux thing)

For my own understanding, what does line 79 (ft_defaults;) do?

@tiborauer

Copy link
Copy Markdown
Member Author

@jones-michael-s

Copy link
Copy Markdown
Collaborator

But why clear it?

@tiborauer

Copy link
Copy Markdown
Member Author

To remove previous (potentially conflicting) settings (e.g. from another version of SPM)

@jones-michael-s

Copy link
Copy Markdown
Collaborator

Update: Ok, today it is not crashing.

If it starts crashing again, I will update.

@jooh

jooh commented Sep 17, 2018

Copy link
Copy Markdown
Collaborator

Ok, I have managed to get through the test suite. Merging...

@jooh

jooh commented Sep 20, 2018

Copy link
Copy Markdown
Collaborator

I pushed one more commit (cc2e390) to the repo - turns out my shell expansion method only works in bash, and the rest of CBU is on tcsh. All fixed now. Sorry not to do another pull request, but this was a hot fix - AA was basically broken for all non-bash users.

jones-michael-s pushed a commit to jones-michael-s/automaticanalysis that referenced this pull request Aug 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants