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 4868, Sat Dec 31 21:08:28 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"],
# Line 217  Line 225 
225  dnl  dnl
226  AC_CHECK_FILES(/proc/cpuinfo)  AC_CHECK_FILES(/proc/cpuinfo)
227    
228    dnl check for getcpu and/or sched_getcpu
229    dnl
230    AC_CHECK_HEADERS([linux/getcpu.h])
231    AC_CHECK_FUNCS([getcpu sched_getcpu])
232    
233  dnl  dnl
234  dnl OS-specific linking issues  dnl OS-specific linking issues
235  dnl  dnl
# Line 252  Line 265 
265  AC_SUBST(LD_NEEDS_RPATH)  AC_SUBST(LD_NEEDS_RPATH)
266  AC_SUBST(LIBM)  AC_SUBST(LIBM)
267    
268    #################### Logging configuration ####################
269    
270    LOGGING_ENABLED=false
271    AC_ARG_ENABLE([event-logging],
272      AC_HELP_STRING([--enable-event-logging], [include event-logging support for parallel target]),
273      [LOGGING_ENABLED=true],
274      [LOGGING_ENABLED=false])
275    
276    AC_SUBST(LOGGING_ENABLED)
277    
278    #################### end Logging configuration ####################
279    
280  #################### CUDA configuration ####################  #################### CUDA configuration ####################
281    
282  AC_ARG_ENABLE([cuda],  AC_ARG_ENABLE([cuda],
# Line 483  Line 508 
508  save_LDFLAGS=$LDFLAGS  save_LDFLAGS=$LDFLAGS
509  save_LIBS=$LIBS  save_LIBS=$LIBS
510  LDFLAGS="$LDFLAGS -L$TEEM_DIR/lib"  LDFLAGS="$LDFLAGS -L$TEEM_DIR/lib"
511  LIBS="$LIBS -lteem"  LIBS="$LIBS -lteem -lm"
512  AC_CHECK_FUNCS([nrrdMetaDataNormalize])  AC_CHECK_FUNCS([nrrdMetaDataNormalize])
513  LDFLAGS=$save_LDFLAGS  LDFLAGS=$save_LDFLAGS
514  LIBS=$save_LIBS  LIBS=$save_LIBS
515    
516  dnl  if test "x$ac_cv_func_nrrdMetaDataNormalize" != xyes; then
517  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"])  
518  fi  fi
519    
520  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
# Line 544  Line 558 
558    
559    dnl check that we have a compatible version of SML/NJ    dnl check that we have a compatible version of SML/NJ
560    dnl    dnl
561    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])])
562    if test $SMLNJ_MAJOR_VERSION -lt 110 \    if test $SMLNJ_MAJOR_VERSION -lt 110 \
563      -o $SMLNJ_MINOR_VERSION -lt 79      -o $SMLNJ_MINOR_VERSION -lt 80
564    then    then
565      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)])
566    fi    fi
567    
568    dnl determine the heap-image suffix    dnl determine the heap-image suffix
# Line 685  Line 699 
699    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"
700    src/lib/build/Makefile    src/lib/build/Makefile
701    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  
702  dnl  dnl
703  dnl ***** SML source files *****  dnl ***** SML source files *****
704    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 712  Line 721 
721  AC_CONFIG_FILES([  AC_CONFIG_FILES([
722    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
723  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])
724  AC_CONFIG_FILES([  
725    src/tests/rtest/scripts/run.sh:src/tests/rtest/scripts/run_sh.in  dnl
726  ], [chmod +x src/tests/rtest/scripts/run.sh])  dnl additional files for logging tools
727  AC_CONFIG_FILES([  dnl
728    src/tests/rtest/scripts/run-one.sh:src/tests/rtest/scripts/run-one_sh.in  if test x"$LOGGING_ENABLED" = xtrue ; then
729  ], [chmod +x src/tests/rtest/scripts/run-one.sh])    AC_CONFIG_FILES(
730  #      src/logging/gen/Makefile
731  # more regression tests; should merge with rtest at some point      src/logging/log-analyze/Makefile
732  #      src/logging/log-dump/Makefile
733  # AC_CONFIG_FILES([      src/logging/gen/main.sml:src/logging/gen/main_sml.in
734  #   rtest2/scripts/run.sh:rtest2/scripts/run_sh.in      src/logging/lib/default-log-paths.hxx:src/logging/lib/default-log-paths_hxx.in
735  # ], [chmod +x rtest2/scripts/run.sh])    )
736  # AC_CONFIG_FILES([  fi
 #   rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in  
 # ], [chmod +x rtest2/scripts/run-one.sh])  
737    
738  dnl  dnl
739  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 752  Line 759 
759  MK_BUILD_DIR(rt-par, parallel, [parallel])  MK_BUILD_DIR(rt-par, parallel, [parallel])
760  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])
761    
762    if test x"$LOGGING_ENABLED" = xtrue ; then
763      MK_BUILD_DIR(rt-par-log, parallel, [parallel logging])
764    fi
765    
766  #if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
767  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])
768  #  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.4868

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