Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dynare
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dóra Kocsis
dynare
Commits
965ea728
Commit
965ea728
authored
Dec 8, 2010
by
Sébastien Villemot
Browse files
Options
Downloads
Patches
Plain Diff
Build system: add detection and linking of MatIO library for Estimation DLL under Octave
parent
fa3e19fd
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
mex/build/octave/Makefile.am
+4
-1
4 additions, 1 deletion
mex/build/octave/Makefile.am
mex/build/octave/configure.ac
+13
-0
13 additions, 0 deletions
mex/build/octave/configure.ac
mex/build/octave/logMHMCMCposterior/Makefile.am
+2
-0
2 additions, 0 deletions
mex/build/octave/logMHMCMCposterior/Makefile.am
with
19 additions
and
1 deletion
mex/build/octave/Makefile.am
+
4
−
1
View file @
965ea728
...
@@ -2,8 +2,11 @@ ACLOCAL_AMFLAGS = -I ../../../m4
...
@@ -2,8 +2,11 @@ ACLOCAL_AMFLAGS = -I ../../../m4
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
# libdynare++ must come before gensylv, k_order_perturbation, dynare_simul_
if
DO_SOMETHING
if
DO_SOMETHING
SUBDIRS
=
mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_
logposterior logMHMCMCposterior
qzcomplex ordschur libslicot kalman_steady_state
SUBDIRS
=
mjdgges kronecker bytecode libdynare++ gensylv k_order_perturbation dynare_simul_ qzcomplex ordschur libslicot kalman_steady_state
if
HAVE_GSL
if
HAVE_GSL
SUBDIRS
+=
swz
SUBDIRS
+=
swz
endif
endif
if
HAVE_MATIO
SUBDIRS
+=
logposterior logMHMCMCposterior
endif
endif
endif
This diff is collapsed.
Click to expand it.
mex/build/octave/configure.ac
+
13
−
0
View file @
965ea728
...
@@ -59,6 +59,12 @@ AC_SUBST([LIBADD_DLOPEN])
...
@@ -59,6 +59,12 @@ AC_SUBST([LIBADD_DLOPEN])
AX_GSL
AX_GSL
AM_CONDITIONAL([HAVE_GSL], [test "x$has_gsl" = "xyes"])
AM_CONDITIONAL([HAVE_GSL], [test "x$has_gsl" = "xyes"])
# Check for libmatio, needed by estimation DLL (only under Octave, as an alternative to MATLAB's libmat)
AC_CHECK_HEADER([matio.h])
AC_CHECK_LIB([matio], [Mat_Open], [LIBADD_MATIO="-lmatio"])
AC_SUBST([LIBADD_MATIO])
AM_CONDITIONAL([HAVE_MATIO], [test "x$ac_cv_header_matio_h" = "xyes" -a "x$ac_cv_lib_matio_Mat_Open" = "xyes"])
AM_CONDITIONAL([DO_SOMETHING], [test "x$MKOCTFILE" != "x"])
AM_CONDITIONAL([DO_SOMETHING], [test "x$MKOCTFILE" != "x"])
if test "x$MKOCTFILE" != "x"; then
if test "x$MKOCTFILE" != "x"; then
...
@@ -77,6 +83,12 @@ else
...
@@ -77,6 +83,12 @@ else
BUILD_SWZ_MEX_OCTAVE="no (missing GSL)"
BUILD_SWZ_MEX_OCTAVE="no (missing GSL)"
fi
fi
if test "x$MKOCTFILE" != "x" -a "x$ac_cv_header_matio_h" = "xyes" -a "x$ac_cv_lib_matio_Mat_Open" = "xyes"; then
BUILD_ESTIMATION_MEX_OCTAVE="yes"
else
BUILD_ESTIMATION_MEX_OCTAVE="no (missing MatIO library)"
fi
AC_ARG_ENABLE([openmp], AS_HELP_STRING([--enable-openmp], [use OpenMP for parallelization of some MEX files]), [
AC_ARG_ENABLE([openmp], AS_HELP_STRING([--enable-openmp], [use OpenMP for parallelization of some MEX files]), [
if test "x$enable_openmp" = "xyes"; then
if test "x$enable_openmp" = "xyes"; then
CPPFLAGS="$CPPFLAGS -DUSE_OMP"
CPPFLAGS="$CPPFLAGS -DUSE_OMP"
...
@@ -92,6 +104,7 @@ Dynare is now configured for building the following components...
...
@@ -92,6 +104,7 @@ Dynare is now configured for building the following components...
Binaries (with "make"):
Binaries (with "make"):
MEX files for Octave (except SWZ): $BUILD_MEX_OCTAVE
MEX files for Octave (except SWZ): $BUILD_MEX_OCTAVE
SWZ MEX files for Octave: $BUILD_SWZ_MEX_OCTAVE
SWZ MEX files for Octave: $BUILD_SWZ_MEX_OCTAVE
Estimation MEX for Octave: $BUILD_ESTIMATION_MEX_OCTAVE
])
])
...
...
This diff is collapsed.
Click to expand it.
mex/build/octave/logMHMCMCposterior/Makefile.am
+
2
−
0
View file @
965ea728
EXEEXT
=
.mex
EXEEXT
=
.mex
include
../mex.am
include
../mex.am
include
../../logMHMCMCposterior.am
include
../../logMHMCMCposterior.am
logMHMCMCposterior_LDADD
+=
$(
LIBADD_MATIO
)
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