Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
miscmaths
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FSL
miscmaths
Commits
7a8bd080
Commit
7a8bd080
authored
4 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
MNT: Clean up, and compile shared not static
parent
12c60252
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!8
Mnt/conda
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+5
-20
5 additions, 20 deletions
Makefile
branchname.log
+0
-1
0 additions, 1 deletion
branchname.log
quick.cc
+0
-42
0 additions, 42 deletions
quick.cc
with
5 additions
and
63 deletions
Makefile
+
5
−
20
View file @
7a8bd080
...
...
@@ -3,29 +3,14 @@
include
${FSLCONFDIR}/default.mk
PROJNAME
=
miscmaths
USRINCFLAGS
=
-I
${
INC_NEWMAT
}
-I
${
INC_BOOST
}
-I
${
INC_CPROB
}
USRLDFLAGS
=
-L
${
LIB_NEWMAT
}
-L
${
LIB_CPROB
}
LIBS
=
-lfsl-utils
-lfsl-cprob
SOFILES
=
libfsl-miscmaths.so
USRCXXFLAGS
=
-std
=
c++11
OBJS
=
miscmaths.o optimise.o miscprob.o kernel.o histogram.o base2z.o t2z.o f2z.o minimize.o cspline.o sparse_matrix.o sparsefn.o rungekutta.o nonlin.o bfmatrix.o Simplex.o SpMatMatrices.o
LIBS
=
-lutils
-lcprob
-lm
# The target "all" should ALWAYS be provided
# typically it will just be another target name
all
:
libmiscmaths.a
quick
:
${OBJS} quick.o
${
CXX
}
${
CXXFLAGS
}
${
LDFLAGS
}
-o
$@
${
OBJS
}
quick.o
${
LIBS
}
libmiscmaths.a
:
${OBJS}
${
AR
}
-r
libmiscmaths.a
${
OBJS
}
%.o
:
%.cpp
$(
CXX11
)
-c
$(
CPPFLAGS
)
$(
CXXFLAGS
)
$<
-o
$@
all
:
libfsl-miscmaths.so
%.o
:
%.cc
$(
CXX
11
)
-c
$(
CPPFLAGS
)
$(
CXXFLAGS
)
$<
-o
$@
libfsl-miscmaths.so
:
${OBJS}
$(
CXX
)
$(
CXXFLAGS
)
-shared
-o
$@
$^
This diff is collapsed.
Click to expand it.
branchname.log
deleted
100644 → 0
+
0
−
1
View file @
12c60252
Initial creation of branchname log file
This diff is collapsed.
Click to expand it.
quick.cc
deleted
100644 → 0
+
0
−
42
View file @
12c60252
/* quick.cc
Mark Woolrich, FMRIB Image Analysis Group
Copyright (C) 1999-2000 University of Oxford */
/* CCOPYRIGHT */
#include
<iostream>
#include
<fstream>
#include
<iomanip>
#include
<sstream>
#define WANT_STREAM
#define WANT_MATH
#include
"miscmaths.h"
#include
"t2z.h"
using
namespace
MISCMATHS
;
int
main
(
int
argc
,
char
*
argv
[])
{
try
{
Matrix
X
=
read_vest
(
"/usr/people/woolrich/matlab/vbbabe/data/design2.mat"
).
t
();
ColumnVector
Y
=
read_vest
(
"/usr/people/woolrich/matlab/vbbabe/data/sdf2.mat"
).
t
();
ColumnVector
m_B
;
SymmetricMatrix
ilambda_B
;
glm_vb
(
X
,
Y
,
m_B
,
ilambda_B
,
30
);
write_ascii_matrix
(
m_B
,
"/usr/people/woolrich/matlab/vbbabe/data/m_B"
);
}
catch
(
Exception
p_excp
)
{
cerr
<<
p_excp
.
what
()
<<
endl
;
}
return
0
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment