Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/vis15/configure.ac
ViewVC logotype

Diff of /branches/vis15/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4430, Thu Aug 18 23:15:00 2016 UTC revision 4842, Tue Dec 20 17:46:11 2016 UTC
# Line 6  Line 6 
6  dnl All rights reserved.  dnl All rights reserved.
7  dnl  dnl
8    
9  AC_INIT(diderot,1.0,)  AC_INIT(diderot,2.0,)
10    
11  AC_PREREQ(2.60)  AC_PREREQ(2.60)
12  AC_COPYRIGHT([[COPYRIGHT (c) 2016 The University of Chicago]])  AC_COPYRIGHT([[COPYRIGHT (c) 2016 The University of Chicago]])
# Line 23  Line 23 
23  dnl  dnl
24  dnl include additional macros  dnl include additional macros
25  dnl  dnl
26    sinclude(config/ax_check_compile_flag.m4)
27    sinclude(config/ax_gcc_x86_cpuid.m4)
28    sinclude(config/ax_gcc_x86_avx_xgetbv.m4)
29    sinclude(config/ax_ext.m4)
30  sinclude(config/acx_pthread.m4)  sinclude(config/acx_pthread.m4)
31  sinclude(config/check_smlnj.m4)  sinclude(config/check_smlnj.m4)
32  sinclude(config/check_smlnj_heap_suffix.m4)  sinclude(config/check_smlnj_heap_suffix.m4)
# Line 50  Line 54 
54  AC_SUBST(DIDEROT_BINDIR)  AC_SUBST(DIDEROT_BINDIR)
55  AC_SUBST(DIDEROT_MKDIR)  AC_SUBST(DIDEROT_MKDIR)
56    
57    dnl
58    dnl the log-file description
59    dnl
60    DEFAULT_LOG_EVENTS_PATH=$DIDEROT_SRCDIR/logging/log-events.json
61    AC_SUBST(DEFAULT_LOG_EVENTS_PATH)
62    
63  #################### end Paths configuration ####################  #################### end Paths configuration ####################
64    
65  dnl check for standard programs  dnl check for standard programs
# Line 73  Line 83 
83  dnl  dnl
84  CXXFLAGS_BASE="-Wreturn-type -Wuninitialized"  CXXFLAGS_BASE="-Wreturn-type -Wuninitialized"
85    
86    dnl check for SIMD support
87    dnl
88    AX_EXT
89    
90  AC_ARG_ENABLE([32-bit],  AC_ARG_ENABLE([32-bit],
91    AC_HELP_STRING([--enable-32-bit], [configure Diderot to produce 32-bit executables]),    AC_HELP_STRING([--enable-32-bit], [configure Diderot to produce 32-bit executables]),
92    [CXXFLAG_Mxx="-m32"],    [CXXFLAG_Mxx="-m32"],
# Line 252  Line 266 
266  AC_SUBST(LD_NEEDS_RPATH)  AC_SUBST(LD_NEEDS_RPATH)
267  AC_SUBST(LIBM)  AC_SUBST(LIBM)
268    
269    #################### Logging configuration ####################
270    
271    LOGGING_ENABLED=false
272    AC_ARG_ENABLE([event-logging],
273      AC_HELP_STRING([--enable-event-logging], [include event-logging support for parallel target]),
274      [LOGGING_ENABLED=true],
275      [LOGGING_ENABLED=false])
276    
277    AC_SUBST(LOGGING_ENABLED)
278    
279    #################### end Logging configuration ####################
280    
281  #################### CUDA configuration ####################  #################### CUDA configuration ####################
282    
283  AC_ARG_ENABLE([cuda],  AC_ARG_ENABLE([cuda],
# Line 483  Line 509 
509  save_LDFLAGS=$LDFLAGS  save_LDFLAGS=$LDFLAGS
510  save_LIBS=$LIBS  save_LIBS=$LIBS
511  LDFLAGS="$LDFLAGS -L$TEEM_DIR/lib"  LDFLAGS="$LDFLAGS -L$TEEM_DIR/lib"
512  LIBS="$LIBS -lteem"  LIBS="$LIBS -lteem -lm"
513  AC_CHECK_FUNCS([nrrdMetaDataNormalize])  AC_CHECK_FUNCS([nrrdMetaDataNormalize])
514  LDFLAGS=$save_LDFLAGS  LDFLAGS=$save_LDFLAGS
515  LIBS=$save_LIBS  LIBS=$save_LIBS
516    
517  dnl  if test "x$ac_cv_func_nrrdMetaDataNormalize" != xyes; then
518  dnl check that unu supports the dnorm command    AC_MSG_ERROR(["please update your teem installation"])
 dnl  
 AC_MSG_CHECKING([that \"unu dnorm\" works])  
 if test -x $TEEM_DIR/bin/unu ; then  
   $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null  
   if test $? -eq 0 ; then  
     AC_MSG_RESULT([yes])  
   else  
     AC_MSG_ERROR([\"unu dnorm\" is not supported; please update your teem installation])  
   fi  
 else  
   AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])  
519  fi  fi
520    
521  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
# Line 544  Line 559 
559    
560    dnl check that we have a compatible version of SML/NJ    dnl check that we have a compatible version of SML/NJ
561    dnl    dnl
562    CHECK_SMLNJ([AC_MSG_ERROR([unable to find SML/NJ installation; check your PATH or set SMLNJ_CMD])])    CHECK_SMLNJ([AC_MSG_ERROR([unable to find SML/NJ installation; please add it to your PATH or set SML_CMD])])
563    if test $SMLNJ_MAJOR_VERSION -lt 110 \    if test $SMLNJ_MAJOR_VERSION -lt 110 \
564      -o $SMLNJ_MINOR_VERSION -lt 79      -o $SMLNJ_MINOR_VERSION -lt 80
565    then    then
566      AC_MSG_ERROR([installation requires SML/NJ version 110.79+ (available from smlnj.org)])      AC_MSG_ERROR([installation requires SML/NJ version 110.80+ (available from smlnj.org)])
567    fi    fi
568    
569    dnl determine the heap-image suffix    dnl determine the heap-image suffix
# Line 685  Line 700 
700    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"
701    src/lib/build/Makefile    src/lib/build/Makefile
702    src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in    src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in
703  dnl  test/MIP/Makefile    src/logging/gen/Makefile
 dnl  test/probe/Makefile  
 dnl  test/iso2d-polyline/Makefile  
 dnl  test/vr-lite-cam/Makefile  
 dnl  test/hlic/Makefile  
704  dnl  dnl
705  dnl ***** SML source files *****  dnl ***** SML source files *****
706    src/compiler/nrrd/run-dnorm.sml:src/compiler/nrrd/run-dnorm_sml.in    src/compiler/nrrd/run-dnorm.sml:src/compiler/nrrd/run-dnorm_sml.in
707    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in
708    src/compiler/common/size-of.sml:src/compiler/common/size-of_sml.in    src/compiler/common/size-of.sml:src/compiler/common/size-of_sml.in
709    src/compiler/options/version.sml:src/compiler/options/version_sml.in    src/compiler/options/version.sml:src/compiler/options/version_sml.in
710      src/logging/gen/main.sml:src/logging/gen/main_sml.in
711  )  )
712    
713  AC_CONFIG_HEADERS(src/lib/include/diderot/config.h:config/config_h.in)  AC_CONFIG_HEADERS(src/lib/include/diderot/config.h:config/config_h.in)
# Line 712  Line 724 
724  AC_CONFIG_FILES([  AC_CONFIG_FILES([
725    src/compiler/gen/fragments/mkmk.sh:src/compiler/gen/fragments/mkmk_sh.in    src/compiler/gen/fragments/mkmk.sh:src/compiler/gen/fragments/mkmk_sh.in
726  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])
 AC_CONFIG_FILES([  
   src/tests/rtest/scripts/run.sh:src/tests/rtest/scripts/run_sh.in  
 ], [chmod +x src/tests/rtest/scripts/run.sh])  
 AC_CONFIG_FILES([  
   src/tests/rtest/scripts/run-one.sh:src/tests/rtest/scripts/run-one_sh.in  
 ], [chmod +x src/tests/rtest/scripts/run-one.sh])  
 #  
 # more regression tests; should merge with rtest at some point  
 #  
 # AC_CONFIG_FILES([  
 #   rtest2/scripts/run.sh:rtest2/scripts/run_sh.in  
 # ], [chmod +x rtest2/scripts/run.sh])  
 # AC_CONFIG_FILES([  
 #   rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in  
 # ], [chmod +x rtest2/scripts/run-one.sh])  
727    
728  dnl  dnl
729  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 752  Line 749 
749  MK_BUILD_DIR(rt-par, parallel, [parallel])  MK_BUILD_DIR(rt-par, parallel, [parallel])
750  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])
751    
752    if test x"$LOGGING_ENABLED" = xtrue ; then
753    MK_BUILD_DIR(rt-par-log, parallel, [parallel logging])
754    fi
755    
756  #if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
757  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])
758  #  MK_BUILD_DIR(rt-cl-d, opencl, [double])  #  MK_BUILD_DIR(rt-cl-d, opencl, [double])

Legend:
Removed from v.4430  
changed lines
  Added in v.4842

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0