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
2020125a
Commit
2020125a
authored
3 years ago
by
Jesper Andersson
Browse files
Options
Downloads
Patches
Plain Diff
Changed nthr to NoOfThreads in splinterpolator constructor
parent
86ea3e72
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!14
Changes related to multi-threading. Does not have to be merged before first conda release.
Pipeline
#13158
waiting for manual action
Stage: fsl-ci-build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
splinterpolator.h
+3
-2
3 additions, 2 deletions
splinterpolator.h
with
3 additions
and
2 deletions
splinterpolator.h
+
3
−
2
View file @
2020125a
...
...
@@ -17,6 +17,7 @@
#include
<thread>
#include
<iomanip>
#include
"armawrap/newmat.h"
#include
"utils/threading.h"
#include
"miscmaths/miscmaths.h"
namespace
SPLINTERPOLATOR
{
...
...
@@ -45,11 +46,11 @@ class Splinterpolator
public:
// Constructors
Splinterpolator
()
:
_valid
(
false
),
_own_coef
(
false
),
_coef
(
0
),
_cptr
(
0
),
_ndim
(
0
),
_nthr
(
1
)
{}
Splinterpolator
(
const
T
*
data
,
const
std
::
vector
<
unsigned
int
>&
dim
,
const
std
::
vector
<
ExtrapolationType
>&
et
,
unsigned
int
order
=
3
,
bool
copy_low_order
=
true
,
unsigned
int
nthr
=
1
,
double
prec
=
1e-8
)
:
_valid
(
false
),
_own_coef
(
false
),
_coef
(
0
),
_cptr
(
0
),
_ndim
(
0
),
_nthr
(
nthr
)
Splinterpolator
(
const
T
*
data
,
const
std
::
vector
<
unsigned
int
>&
dim
,
const
std
::
vector
<
ExtrapolationType
>&
et
,
unsigned
int
order
=
3
,
bool
copy_low_order
=
true
,
Utilities
::
NoOfThreads
nthr
=
Utilities
::
NoOfThreads
(
1
)
,
double
prec
=
1e-8
)
:
_valid
(
false
),
_own_coef
(
false
),
_coef
(
0
),
_cptr
(
0
),
_ndim
(
0
),
_nthr
(
nthr
.
_n
)
{
common_construction
(
data
,
dim
,
order
,
prec
,
et
,
copy_low_order
);
}
Splinterpolator
(
const
T
*
data
,
const
std
::
vector
<
unsigned
int
>&
dim
,
ExtrapolationType
et
=
Zeros
,
unsigned
int
order
=
3
,
bool
copy_low_order
=
true
,
unsigned
int
nthr
=
1
,
double
prec
=
1e-8
)
:
_valid
(
false
),
_own_coef
(
false
),
_coef
(
0
),
_cptr
(
0
),
_ndim
(
0
),
_nthr
(
nthr
)
Splinterpolator
(
const
T
*
data
,
const
std
::
vector
<
unsigned
int
>&
dim
,
ExtrapolationType
et
=
Zeros
,
unsigned
int
order
=
3
,
bool
copy_low_order
=
true
,
Utilities
::
NoOfThreads
nthr
=
Utilities
::
NoOfThreads
(
1
)
,
double
prec
=
1e-8
)
:
_valid
(
false
),
_own_coef
(
false
),
_coef
(
0
),
_cptr
(
0
),
_ndim
(
0
),
_nthr
(
nthr
.
_n
)
{
std
::
vector
<
ExtrapolationType
>
ett
(
dim
.
size
(),
et
);
common_construction
(
data
,
dim
,
order
,
prec
,
ett
,
copy_low_order
);
...
...
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