Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
maestro-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
maestro
maestro-core
Commits
def7a072
Commit
def7a072
authored
3 years ago
by
Utz-Uwe Haus
Browse files
Options
Downloads
Patches
Plain Diff
[liberl] add embedded build option
parent
588da11d
No related branches found
No related tags found
1 merge request
!49
Draft: Resolve "liberl installation issue on devel"
Pipeline
#89821
failed
3 years ago
Stage: build-and-test
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
deps/liberl/Makefile.am
+8
-1
8 additions, 1 deletion
deps/liberl/Makefile.am
deps/liberl/configure.ac
+10
-0
10 additions, 0 deletions
deps/liberl/configure.ac
deps/liberl/include/erl_threadpool.h
+1
-1
1 addition, 1 deletion
deps/liberl/include/erl_threadpool.h
with
19 additions
and
2 deletions
deps/liberl/Makefile.am
+
8
−
1
View file @
def7a072
...
@@ -31,10 +31,17 @@
...
@@ -31,10 +31,17 @@
#
#
ACLOCAL_AMFLAGS
=
-I
m4
ACLOCAL_AMFLAGS
=
-I
m4
noinst_LTLIBRARIES
=
lib_LTLIBRARIES
=
if
EMBEDDED
noinst_LTLIBRARIES
+=
liberl.la
else
lib_LTLIBRARIES
+=
liberl.la
endif
# ERL library
# ERL library
SUBDIRS
=
erl
.
tests
SUBDIRS
=
erl
.
tests
lib_LTLIBRARIES
=
liberl.la
liberl_la_SOURCES
=
include/erl_status.h
\
liberl_la_SOURCES
=
include/erl_status.h
\
include/erl_logging.h
\
include/erl_logging.h
\
include/erl_threadpool.h
\
include/erl_threadpool.h
\
...
...
This diff is collapsed.
Click to expand it.
deps/liberl/configure.ac
+
10
−
0
View file @
def7a072
...
@@ -37,6 +37,16 @@ AC_PROG_CC
...
@@ -37,6 +37,16 @@ AC_PROG_CC
AM_PROG_AR
AM_PROG_AR
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-ustar])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-ustar])
AC_ARG_ENABLE([embedded],
[AS_HELP_STRING([--enable-embedded],
[Enable embedded support (build convenience library, no symbol versioning) @<:@default=no@:>@])
],
[ac_asm_symver_support=0
icc_symver_hack=1],
[enable_embedded=no])
AM_CONDITIONAL([EMBEDDED], [test x"$enable_embedded" = x"yes"])
AC_ARG_ENABLE([numa],
AC_ARG_ENABLE([numa],
[AS_HELP_STRING([--enable-numa],[Disable libnuma usage (default: use if detected)])],
[AS_HELP_STRING([--enable-numa],[Disable libnuma usage (default: use if detected)])],
[enable_numa=$enableval],[enable_numa=yes])
[enable_numa=$enableval],[enable_numa=yes])
...
...
This diff is collapsed.
Click to expand it.
deps/liberl/include/erl_threadpool.h
+
1
−
1
View file @
def7a072
...
@@ -84,7 +84,7 @@ erl__get_binding_index_rr1(const struct erl_threadpool_attr *attr, int nnodes, i
...
@@ -84,7 +84,7 @@ erl__get_binding_index_rr1(const struct erl_threadpool_attr *attr, int nnodes, i
int
int
erl__get_binding_index_rrall
(
const
struct
erl_threadpool_attr
*
attr
,
int
nnodes
,
int
ncpus
,
int
tid
);
erl__get_binding_index_rrall
(
const
struct
erl_threadpool_attr
*
attr
,
int
nnodes
,
int
ncpus
,
int
tid
);
int
(
*
erl__get_binding_index
[
ERL_tp_cpubind__max
])
static
int
(
*
const
erl__get_binding_index
[
ERL_tp_cpubind__max
])
(
const
struct
erl_threadpool_attr
*
attr
,
int
nnodes
,
int
ncpus
,
int
tid
)
=
{
(
const
struct
erl_threadpool_attr
*
attr
,
int
nnodes
,
int
ncpus
,
int
tid
)
=
{
erl__get_binding_error
,
erl__get_binding_error
,
erl__get_binding_index_fixed
,
erl__get_binding_index_fixed
,
...
...
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