Skip to content

Commit

Permalink
more progress on pioperformance
Browse files Browse the repository at this point in the history
  • Loading branch information
edhartnett committed Apr 9, 2019
1 parent ba3e0d6 commit 93d0298
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
10 changes: 9 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,15 @@ fi
# If we want the timing library, we must find it.
if test "x$enable_timing" = xyes; then
AC_CHECK_HEADERS([gptl.h])
AC_CHECK_LIB([gptl], [GPTLinitialize], [], [AC_MSG_ERROR([Can't find or link to the GPTL library.])])
AC_CHECK_LIB([gptl], [GPTLinitialize], [],
[AC_MSG_ERROR([Can't find or link to the GPTL library.])])
if test "x$enable_fortran" = xyes; then
AC_LANG_PUSH([Fortran])
# AC_CHECK_HEADERS([gptl.inc])
AC_CHECK_LIB([gptlf], [gptlstart], [],
[AC_MSG_ERROR([Can't find or link to the GPTL Fortran library.])])
AC_LANG_POP([Fortran])
fi
fi

AC_CONFIG_FILES(src/flib/piodarray.F90:src/flib/piodarray.F90.in2)
Expand Down
13 changes: 11 additions & 2 deletions tests/performance/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,21 @@
# Put together AM_CPPFLAGS and AM_LDFLAGS.
include $(top_srcdir)/set_flags.am

LDADD = libpio_tutil.la \
# Link to test util library and PIO Fortran and C libs.
LDADD = $(top_builddir)/src/gptl/libperf_mod.la \
$(top_builddir)/src/gptl/libperf_utils.la \
${top_builddir}/tests/general/libpio_tutil.la \
${top_builddir}/src/flib/libpiof.la \
${top_builddir}/src/clib/libpio.la

# Find perf_mod and perf_util.
AM_CPPFLAGS += -I$(top_builddir)/src/gptl

# Find pio_tutil.mod
AM_CPPFLAGS += -I$(top_builddir)/tests/general

# Build the test for make check.
bin_PROGRAMS = pioperformance
check_PROGRAMS = pioperformance

pioperformance_SOURCES = pioperformance.F90

Expand Down

0 comments on commit 93d0298

Please sign in to comment.