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 4419, Wed Aug 17 12:49:55 2016 UTC revision 4849, Wed Dec 21 17:25:30 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 73  Line 77 
77  dnl  dnl
78  CXXFLAGS_BASE="-Wreturn-type -Wuninitialized"  CXXFLAGS_BASE="-Wreturn-type -Wuninitialized"
79    
80    dnl check for SIMD support
81    dnl
82    AX_EXT
83    
84  AC_ARG_ENABLE([32-bit],  AC_ARG_ENABLE([32-bit],
85    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]),
86    [CXXFLAG_Mxx="-m32"],    [CXXFLAG_Mxx="-m32"],
87    [CXXFLAG_Mxx="-m64"])    [CXXFLAG_Mxx="-m64"])
88    
 dnl check to see if we need the explicitly instantiate templates (as required by gcc).  
 dnl  
 case x"$CXX" in  
   xclang*)  
     EXPLICIT_TEMPLATES="false"  
     ;;  
   *)  
     CXXFLAGS_BASE="$CXXFLAGS_BASE -fno-implicit-templates"  
     EXPLICIT_TEMPLATES="true"  
     ;;  
 esac  
   
89  CXXFLAGS="$CXXFLAG_Mxx $CXXFLAGS_BASE"  CXXFLAGS="$CXXFLAG_Mxx $CXXFLAGS_BASE"
90  AC_SUBST(CXXFLAG_Mxx)  AC_SUBST(CXXFLAG_Mxx)
91  AC_SUBST(CXXFLAGS_BASE)  AC_SUBST(CXXFLAGS_BASE)
 AC_SUBST(EXPLICIT_TEMPLATES)  
92    
93  dnl  dnl
94  dnl run the compiler tests in 64-bit mode  dnl run the compiler tests in 64-bit mode
# Line 265  Line 260 
260  AC_SUBST(LD_NEEDS_RPATH)  AC_SUBST(LD_NEEDS_RPATH)
261  AC_SUBST(LIBM)  AC_SUBST(LIBM)
262    
263    #################### Logging configuration ####################
264    
265    LOGGING_ENABLED=false
266    AC_ARG_ENABLE([event-logging],
267      AC_HELP_STRING([--enable-event-logging], [include event-logging support for parallel target]),
268      [LOGGING_ENABLED=true],
269      [LOGGING_ENABLED=false])
270    
271    AC_SUBST(LOGGING_ENABLED)
272    
273    #################### end Logging configuration ####################
274    
275  #################### CUDA configuration ####################  #################### CUDA configuration ####################
276    
277  AC_ARG_ENABLE([cuda],  AC_ARG_ENABLE([cuda],
# Line 491  Line 498 
498    AC_MSG_ERROR([unable to find teem])    AC_MSG_ERROR([unable to find teem])
499  fi  fi
500  dnl  dnl
501  dnl check that unu supports the dnorm command  dnl check that teem supports the nrrdMetaDataNormalize function
502  dnl  dnl
503  AC_MSG_CHECKING([that \"unu dnorm\" works])  save_LDFLAGS=$LDFLAGS
504  if test -x $TEEM_DIR/bin/unu ; then  save_LIBS=$LIBS
505    $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null  LDFLAGS="$LDFLAGS -L$TEEM_DIR/lib"
506    if test $? -eq 0 ; then  LIBS="$LIBS -lteem -lm"
507      AC_MSG_RESULT([yes])  AC_CHECK_FUNCS([nrrdMetaDataNormalize])
508    else  LDFLAGS=$save_LDFLAGS
509      AC_MSG_ERROR([\"unu dnorm\" is not supported; please update your teem installation])  LIBS=$save_LIBS
510    fi  
511  else  if test "x$ac_cv_func_nrrdMetaDataNormalize" != xyes; then
512    AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])    AC_MSG_ERROR(["please update your teem installation"])
513  fi  fi
514    
515  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
# Line 546  Line 553 
553    
554    dnl check that we have a compatible version of SML/NJ    dnl check that we have a compatible version of SML/NJ
555    dnl    dnl
556    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])])
557    if test $SMLNJ_MAJOR_VERSION -lt 110 \    if test $SMLNJ_MAJOR_VERSION -lt 110 \
558      -o $SMLNJ_MINOR_VERSION -lt 79      -o $SMLNJ_MINOR_VERSION -lt 80
559    then    then
560      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)])
561    fi    fi
562    
563    dnl determine the heap-image suffix    dnl determine the heap-image suffix
# Line 687  Line 694 
694    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"
695    src/lib/build/Makefile    src/lib/build/Makefile
696    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
 dnl  test/MIP/Makefile  
 dnl  test/probe/Makefile  
 dnl  test/iso2d-polyline/Makefile  
 dnl  test/vr-lite-cam/Makefile  
 dnl  test/hlic/Makefile  
697  dnl  dnl
698  dnl ***** SML source files *****  dnl ***** SML source files *****
699    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
# Line 714  Line 716 
716  AC_CONFIG_FILES([  AC_CONFIG_FILES([
717    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
718  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])
719  AC_CONFIG_FILES([  
720    src/tests/rtest/scripts/run.sh:src/tests/rtest/scripts/run_sh.in  dnl
721  ], [chmod +x src/tests/rtest/scripts/run.sh])  dnl additional files for logging tools
722  AC_CONFIG_FILES([  dnl
723    src/tests/rtest/scripts/run-one.sh:src/tests/rtest/scripts/run-one_sh.in  if test x"$LOGGING_ENABLED" = xtrue ; then
724  ], [chmod +x src/tests/rtest/scripts/run-one.sh])    AC_CONFIG_FILES(
725  #      src/logging/gen/Makefile
726  # more regression tests; should merge with rtest at some point      src/logging/log-dump/Makefile
727  #      src/logging/gen/main.sml:src/logging/gen/main_sml.in
728  # AC_CONFIG_FILES([      src/logging/lib/default-log-paths.hxx:src/logging/lib/default-log-paths_hxx.in
729  #   rtest2/scripts/run.sh:rtest2/scripts/run_sh.in    )
730  # ], [chmod +x rtest2/scripts/run.sh])  fi
 # AC_CONFIG_FILES([  
 #   rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in  
 # ], [chmod +x rtest2/scripts/run-one.sh])  
731    
732  dnl  dnl
733  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 754  Line 753 
753  MK_BUILD_DIR(rt-par, parallel, [parallel])  MK_BUILD_DIR(rt-par, parallel, [parallel])
754  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])
755    
756    if test x"$LOGGING_ENABLED" = xtrue ; then
757      MK_BUILD_DIR(rt-par-log, parallel, [parallel logging])
758    fi
759    
760  #if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
761  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])
762  #  MK_BUILD_DIR(rt-cl-d, opencl, [double])  #  MK_BUILD_DIR(rt-cl-d, opencl, [double])

Legend:
Removed from v.4419  
changed lines
  Added in v.4849

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