-
Notifications
You must be signed in to change notification settings - Fork 75
Update ir_mex_build to build penalty_mex file #32
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
base: jf/penalty_mex
Are you sure you want to change the base?
Changes from 7 commits
da0b832
b41c2ef
713ae45
8e906c7
bd6193e
a831b4e
69bb0cb
111bef7
0db76ed
4ad5374
f377c64
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,5 +12,6 @@ | |
|
|
||
| ir_mex_build_mri | ||
| ir_mex_build_table | ||
| irt_mex_make | ||
|
|
||
| % todo: ir_mex_build_penal | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| % irt_mex_make.m | ||
|
|
||
| if ispc | ||
| cd penalty | ||
| mex penalty_mex.c mexarg.c 'penalty,diff.c' -DIs_pc -DMmex -outdir ../v7 | ||
| cd .. | ||
| cd mex/src/penalty | ||
| mex penalty_mex.c mexarg.c 'penalty,diff.c' -DIs_pc -DMmex -outdir ../../local | ||
| cd ../../.. | ||
| else | ||
| cd penalty | ||
| mex -v penalty_mex.c mexarg.c 'penalty,diff.c' -DMmex -outdir ../v7 | ||
| cd .. | ||
| cd mex/src/penalty | ||
| mex -v penalty_mex.c '../def/mexarg.c' 'penalty,diff.c' -I'../def/' -DMmex -outdir ../../local | ||
| cd ../../.. | ||
| end |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,6 +29,11 @@ | |
| irtdir = [irtdir filesep]; | ||
| end | ||
|
|
||
| if ~exist([irtdir 'mex/local'], 'dir') | ||
| disp(sprintf('The directory "%s" does not exist. Creating it now.', [irtdir 'mex/local'])) | ||
| mkdir([irtdir 'mex/local']); | ||
| end | ||
|
|
||
|
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Automatically create the mex/local directory if it doesn't exist |
||
| list = {... | ||
| 'align', ... % image registration | ||
| 'align/mex', ... % image registration mex files | ||
|
|
@@ -41,6 +46,8 @@ | |
| 'fbp', ... % FBP (filtered backprojection) code | ||
| 'general', ... % generic image reconstruction | ||
| 'graph', ... % graphics routines | ||
| 'mex/local', ... % MEX files compiled for local OS/CPU | ||
| 'mex/src', ... % MEX source code for irt_mex_make.m | ||
| 'mri', ... % MRI reconstruction | ||
| 'mri/fieldmap', ... % MRI B0 field map estimation | ||
| 'mri-rf/yip-spsp', ... % MRI RF pulse design | ||
|
|
@@ -70,8 +77,10 @@ | |
| % e.g., 7.3 and running on earlier 7.0 won't work. | ||
| % If you have mex problems, comment out the following line. | ||
| % Much of the toolbox will work without mex, just slower. | ||
| addpath([irtdir 'mex/local']) % must precede "mex/v7" | ||
| addpath([irtdir 'mex/v7']); | ||
|
|
||
| disp('NOTE: Previous irt versions expected MEX files in "mex/v7".') | ||
|
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added a comment about the mex/v7 directory. Let me know if you prefer a different message!
kristinazvolanek marked this conversation as resolved.
Outdated
|
||
|
|
||
| % do not add the paths below if you are using Matlab! | ||
| if ir_is_octave | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.