Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V1.3 #8

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
2dabb7b
Reason: updates to include ROI data
bacaron Jun 9, 2020
7fee9ce
Reason: push compiled binaries
Jun 9, 2020
6fb1399
Reason: update main
Jun 9, 2020
55623bd
Reason: update compiled code
Jun 9, 2020
7eea6e6
Reason: final commit
bacaron Jun 9, 2020
4e2aff9
Update main
bacaron Jun 9, 2020
1b39e6f
Update main
bacaron Jun 9, 2020
87256b5
Update main
bacaron Jun 9, 2020
bb49a9a
Update main
bacaron Jun 9, 2020
c354017
Update main
bacaron Jun 9, 2020
058e6d4
Update main
bacaron Jun 9, 2020
ca9ffc8
Reason: make smart and figure out appropriate lines
bacaron Jun 23, 2020
88fa2fd
Reason: make smart and figure out appropriate lines
bacaron Jun 23, 2020
8ffdbcf
Update main
bacaron Jun 23, 2020
7fd0ea8
Update create_data_csv.py
bacaron Jun 24, 2020
ebf95ab
REason: output structure better suited for MLC
bacaron Jun 24, 2020
427e49e
Reason: fix issues
bacaron Jun 24, 2020
3968aab
reason: remove license.txt
bacaron Jun 24, 2020
9ad3cab
Reason: update whole brain measures
bacaron Jun 24, 2020
5d956bb
Reason: uncomment end steps
bacaron Jun 24, 2020
2ddeaa4
Reason: small fix
bacaron Jun 24, 2020
d5bf4e5
Reason: small fix
bacaron Jun 24, 2020
62ad53d
Reason: small fix
bacaron Jun 24, 2020
d3b94e2
Reason: small fix
bacaron Jun 24, 2020
d18d080
Reason: changes for freesurfer v5
bacaron Aug 28, 2020
547fc6a
Reason: changes for freesurfer v5
bacaron Aug 28, 2020
5fa66d5
Reason: final commits
bacaron Aug 28, 2020
228ba39
Reason: final commits
bacaron Aug 28, 2020
7169a1e
reason: add capability to grab subcortical structures data
bacaron Nov 16, 2020
061cdf6
Update main
bacaron Jun 3, 2021
272f2dd
reason: update README
bacaron Apr 19, 2022
d08a36e
reason: update README
bacaron Apr 19, 2022
7adc39b
Merge branch 'master' into v1.3
bacaron Jul 4, 2022
9758f50
Update main
bacaron Nov 17, 2022
c75055e
Update main
bacaron Nov 17, 2022
163e96a
Update main
bacaron Nov 17, 2022
fc843f6
Update main
bacaron Nov 17, 2022
101d5a4
Update main
bacaron Nov 17, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
addpath(genpath('/N/u/brlife/git/vistasoft'))
addpath(genpath('/N/u/brlife/git/jsonlab'))
addpath(genpath('/N/u/brlife/git/wma_tools'))
mcc -m -R -nodisplay -d compiled parcRoiStats
exit
13 changes: 13 additions & 0 deletions compile.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
module load matlab/2019a

mkdir compiled

cat > build.m <<END
addpath(genpath('/N/u/brlife/git/vistasoft'))
addpath(genpath('/N/u/brlife/git/jsonlab'))
addpath(genpath('/N/u/brlife/git/wma_tools'))
mcc -m -R -nodisplay -d compiled parcRoiStats
exit
END
matlab -nodisplay -nosplash -r build
2 changes: 2 additions & 0 deletions compiled/mccExcludedFiles.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The List of Excluded Files
Excluded files Exclusion Message ID Reason For Exclusion Exclusion Rule
Binary file added compiled/parcRoiStats
Binary file not shown.
102 changes: 102 additions & 0 deletions compiled/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
parcRoiStats Executable

1. Prerequisites for Deployment

Verify that version 9.6 (R2019a) of the MATLAB Runtime is installed.
If not, you can run the MATLAB Runtime installer.
To find its location, enter

>>mcrinstaller

at the MATLAB prompt.

Alternatively, download and install the Linux version of the MATLAB Runtime for R2019a
from the following link on the MathWorks website:

http://www.mathworks.com/products/compiler/mcr/index.html

For more information about the MATLAB Runtime and the MATLAB Runtime installer, see
"Distribute Applications" in the MATLAB Compiler documentation
in the MathWorks Documentation Center.

2. Files to Deploy and Package

Files to Package for Standalone
================================
-parcRoiStats
-run_parcRoiStats.sh (shell script for temporarily setting environment variables and
executing the application)
-to run the shell script, type

./run_parcRoiStats.sh <mcr_directory> <argument_list>

at Linux or Mac command prompt. <mcr_directory> is the directory
where version 9.6 of the MATLAB Runtime is installed or the directory where
MATLAB is installed on the machine. <argument_list> is all the
arguments you want to pass to your application. For example,

If you have version 9.6 of the MATLAB Runtime installed in
/mathworks/home/application/v96, run the shell script as:

./run_parcRoiStats.sh /mathworks/home/application/v96

If you have MATLAB installed in /mathworks/devel/application/matlab,
run the shell script as:

./run_parcRoiStats.sh /mathworks/devel/application/matlab
-MCRInstaller.zip
Note: if end users are unable to download the MATLAB Runtime using the
instructions in the previous section, include it when building your
component by clicking the "Runtime included in package" link in the
Deployment Tool.
-This readme file



3. Definitions

For information on deployment terminology, go to
http://www.mathworks.com/help and select MATLAB Compiler >
Getting Started > About Application Deployment >
Deployment Product Terms in the MathWorks Documentation
Center.

4. Appendix

A. Linux systems:
In the following directions, replace MR/v96 by the directory on the target machine where
MATLAB is installed, or MR by the directory where the MATLAB Runtime is installed.

(1) Set the environment variable XAPPLRESDIR to this value:

MR/v96/X11/app-defaults


(2) If the environment variable LD_LIBRARY_PATH is undefined, set it to the following:

MR/v96/runtime/glnxa64:MR/v96/bin/glnxa64:MR/v96/sys/os/glnxa64:MR/v96/sys/opengl/lib/glnxa64

If it is defined, set it to the following:

${LD_LIBRARY_PATH}:MR/v96/runtime/glnxa64:MR/v96/bin/glnxa64:MR/v96/sys/os/glnxa64:MR/v96/sys/opengl/lib/glnxa64

For more detailed information about setting the MATLAB Runtime paths, see Package and
Distribute in the MATLAB Compiler documentation in the MathWorks Documentation Center.



NOTE: To make these changes persistent after logout on Linux
or Mac machines, modify the .cshrc file to include this
setenv command.
NOTE: The environment variable syntax utilizes forward
slashes (/), delimited by colons (:).
NOTE: When deploying standalone applications, you can
run the shell script file run_parcRoiStats.sh
instead of setting environment variables. See
section 2 "Files to Deploy and Package".






1 change: 1 addition & 0 deletions compiled/requiredMCRProducts.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
35000 35010
33 changes: 33 additions & 0 deletions compiled/run_parcRoiStats.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/bin/sh
# script for execution of deployed applications
#
# Sets up the MATLAB Runtime environment for the current $ARCH and executes
# the specified command.
#
exe_name=$0
exe_dir=`dirname "$0"`
echo "------------------------------------------"
if [ "x$1" = "x" ]; then
echo Usage:
echo $0 \<deployedMCRroot\> args
else
echo Setting up environment variables
MCRROOT="$1"
echo ---
LD_LIBRARY_PATH=.:${MCRROOT}/runtime/glnxa64 ;
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MCRROOT}/bin/glnxa64 ;
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MCRROOT}/sys/os/glnxa64;
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MCRROOT}/sys/opengl/lib/glnxa64;
export LD_LIBRARY_PATH;
echo LD_LIBRARY_PATH is ${LD_LIBRARY_PATH};
shift 1
args=
while [ $# -gt 0 ]; do
token=$1
args="${args} \"${token}\""
shift
done
eval "\"${exe_dir}/parcRoiStats\"" $args
fi
exit

114 changes: 0 additions & 114 deletions create-data-csv-old.py

This file was deleted.

Loading