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.

Sign up for GitHub

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

Jump to bottom

Changes as per fix in https://github.com/ISMRM/mri_unbound/issues/1 #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changes as per fix in https://github.com/ISMRM/mri_unbound/issues/1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d48440
Changes as per fix in https://github.com/ISMRM/mri_unbound/issues/1
curtcorum May 3, 2021
b765ca5
Update .gitignore
curtcorum May 3, 2021
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ build/
/local/
/doc/
/__MACOSX/
*.raw
*.mexa64
10 changes: 8 additions & 2 deletions grid3/Makefile.MATLAB
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Rev: 2011 aug 21
#
# The mex file can also be compiled from the MATLAB commandline using:
# > mex grid3_MAT.c
# > mex -compatibleArrayDims grid3_MAT.c
#


Expand All @@ -23,14 +23,20 @@ OUTPUT_DIR=./
# MATLAB 2009b 64bit
# ubuntu 10.10 x86_64
# gcc (Ubuntu/Linaro 4.4.4-14ubuntu5) 4.4.5
#
# MATLAB 2021a
# Ubuntu 18.04.5 LTS (GNU/Linux 5.4.0-70-generic x86_64)
# gcc version 7.5.0 (Ubuntu 7.5.0-3ubuntu1~18.04)
#

CFLAGS="-std=c99 -D_GNU_SOURCE -fexceptions -fPIC -fno-omit-frame-pointer "
MFLAGS=-v -compatibleArrayDims

.SUFFIXES: .c
.PHONY: all

% :: %.c
$(MEX) -v CFLAGS=$(CFLAGS) -outdir $(OUTPUT_DIR) $<
$(MEX) $(MFLAGS) CFLAGS=$(CFLAGS) -outdir $(OUTPUT_DIR) $<
#$(MEX) -v -outdir $(OUTPUT_DIR) $<


10 changes: 8 additions & 2 deletions sdc3/Makefile.MATLAB
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,19 @@ OUTPUT_DIR=./
# ubuntu 10.10 x86_64
# gcc (Ubuntu/Linaro 4.4.4-14ubuntu5) 4.4.5
#
# MATLAB 2021a
# Ubuntu 18.04.5 LTS (GNU/Linux 5.4.0-70-generic x86_64)
# gcc version 7.5.0 (Ubuntu 7.5.0-3ubuntu1~18.04)
#

CFLAGS="-std=c99 -D_GNU_SOURCE -fexceptions -fPIC -fno-omit-frame-pointer "
MFLAGS= -v -compatibleArrayDims

.SUFFIXES: .c
.PHONY: all

% :: %.c
$(MEX) -v -outdir $(OUTPUT_DIR) $<
# $(MEX) -v -outdir $(OUTPUT_DIR) $<
# $(MEX) -v CFLAGS=$(CFLAGS) -outdir $(OUTPUT_DIR) $<

$(MEX) $(MFLAGS) CFLAGS=$(CFLAGS) -outdir $(OUTPUT_DIR) $<

6 changes: 5 additions & 1 deletion sdc3/README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ MATLAB:
This is compiled by navigating to the directory
containing this package, and typing:

mex -v sdc3_MAT.c
mex -v -compatibleArrayDims sdc3_MAT.c

on the MATLAB command-line (make sure to setup the mex
configuration first). Alternatively this may be
Expand All @@ -44,6 +44,10 @@ MATLAB:
gcc version 4.4.5 (Ubuntu/Linaro 4.4.4-14ubuntu5)
MATLAB 7.9.0.529 (R2009b) 64bit

MATLAB 2021a
Ubuntu 18.04.5 LTS (GNU/Linux 5.4.0-70-generic x86_64)
gcc version 7.5.0 (Ubuntu 7.5.0-3ubuntu1~18.04)

OSX:
Apple OSX 10.6.7
gcc version 4.2.1 (Apple Inc. build 5666) (dot 3)
Expand Down