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 4884, Mon Jan 2 18:46:26 2017 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 230  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    hasGetCPU=no;
231    AC_CHECK_HEADERS([linux/getcpu.h])
232    if test "x$ac_cv_header_linux_getcpu_h" = xyes; then
233      AC_CHECK_FUNCS([getcpu])
234      hasGetCPU=yes;
235    else
236      # getcpu is usually called using syscall
237      #
238      AC_MSG_CHECKING([SYS_getcpu])
239      AC_RUN_IFELSE([AC_LANG_SOURCE([[
240        #define _GNU_SOURCE
241        #include <unistd.h>
242        #include <sys/syscall.h>
243        int main () {
244          unsigned cpu, node;
245          return syscall (SYS_getcpu, &cpu, &node, 0);
246        }
247        ]])],[hasGetCPU=yes],[])
248      AC_MSG_RESULT([$hasGetCPU])
249      if test x"$hasGetCPU" = xyes ; then
250        AC_DEFINE([HAVE_SYS_GETCPU],[1],[Define if SYS_getcpu is defined in <sys/syscall.h>])
251      fi
252    fi
253    if test x"$hasGetCPU" != xyes ; then
254    AC_CHECK_FUNCS([sched_getcpu])
255    fi
256    
257  dnl  dnl
258  dnl OS-specific linking issues  dnl OS-specific linking issues
259  dnl  dnl
# Line 265  Line 289 
289  AC_SUBST(LD_NEEDS_RPATH)  AC_SUBST(LD_NEEDS_RPATH)
290  AC_SUBST(LIBM)  AC_SUBST(LIBM)
291    
292    #################### Logging configuration ####################
293    
294    LOGGING_ENABLED=false
295    AC_ARG_ENABLE([event-logging],
296      AC_HELP_STRING([--enable-event-logging], [include event-logging support for parallel target]),
297      [LOGGING_ENABLED=true],
298      [LOGGING_ENABLED=false])
299    
300    AC_SUBST(LOGGING_ENABLED)
301    
302    #################### end Logging configuration ####################
303    
304  #################### CUDA configuration ####################  #################### CUDA configuration ####################
305    
306  AC_ARG_ENABLE([cuda],  AC_ARG_ENABLE([cuda],
# Line 491  Line 527 
527    AC_MSG_ERROR([unable to find teem])    AC_MSG_ERROR([unable to find teem])
528  fi  fi
529  dnl  dnl
530  dnl check that unu supports the dnorm command  dnl check that teem supports the nrrdMetaDataNormalize function
531  dnl  dnl
532  AC_MSG_CHECKING([that \"unu dnorm\" works])  save_LDFLAGS=$LDFLAGS
533  if test -x $TEEM_DIR/bin/unu ; then  save_LIBS=$LIBS
534    $TEEM_DIR/bin/unu dnorm > /dev/null 2> /dev/null  LDFLAGS="$LDFLAGS -L$TEEM_DIR/lib"
535    if test $? -eq 0 ; then  LIBS="$LIBS -lteem -lm"
536      AC_MSG_RESULT([yes])  AC_CHECK_FUNCS([nrrdMetaDataNormalize])
537    else  LDFLAGS=$save_LDFLAGS
538      AC_MSG_ERROR([\"unu dnorm\" is not supported; please update your teem installation])  LIBS=$save_LIBS
539    fi  
540  else  if test "x$ac_cv_func_nrrdMetaDataNormalize" != xyes; then
541    AC_MSG_ERROR([unable to find unu executable in $TEEM_DIR/bin"])    AC_MSG_ERROR(["please update your teem installation"])
542  fi  fi
543    
544  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
# Line 546  Line 582 
582    
583    dnl check that we have a compatible version of SML/NJ    dnl check that we have a compatible version of SML/NJ
584    dnl    dnl
585    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])])
586    if test $SMLNJ_MAJOR_VERSION -lt 110 \    if test $SMLNJ_MAJOR_VERSION -lt 110 \
587      -o $SMLNJ_MINOR_VERSION -lt 79      -o $SMLNJ_MINOR_VERSION -lt 80
588    then    then
589      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)])
590    fi    fi
591    
592    dnl determine the heap-image suffix    dnl determine the heap-image suffix
# Line 687  Line 723 
723    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"
724    src/lib/build/Makefile    src/lib/build/Makefile
725    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  
726  dnl  dnl
727  dnl ***** SML source files *****  dnl ***** SML source files *****
728    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 745 
745  AC_CONFIG_FILES([  AC_CONFIG_FILES([
746    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
747  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])
748  AC_CONFIG_FILES([  
749    src/tests/rtest/scripts/run.sh:src/tests/rtest/scripts/run_sh.in  dnl
750  ], [chmod +x src/tests/rtest/scripts/run.sh])  dnl additional files for logging tools
751  AC_CONFIG_FILES([  dnl
752    src/tests/rtest/scripts/run-one.sh:src/tests/rtest/scripts/run-one_sh.in  if test x"$LOGGING_ENABLED" = xtrue ; then
753  ], [chmod +x src/tests/rtest/scripts/run-one.sh])    AC_CONFIG_FILES(
754  #      src/logging/gen/Makefile
755  # more regression tests; should merge with rtest at some point      src/logging/log-analyze/Makefile
756  #      src/logging/log-dump/Makefile
757  # AC_CONFIG_FILES([      src/logging/gen/main.sml:src/logging/gen/main_sml.in
758  #   rtest2/scripts/run.sh:rtest2/scripts/run_sh.in      src/logging/lib/default-log-paths.hxx:src/logging/lib/default-log-paths_hxx.in
759  # ], [chmod +x rtest2/scripts/run.sh])    )
760  # AC_CONFIG_FILES([  fi
 #   rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in  
 # ], [chmod +x rtest2/scripts/run-one.sh])  
761    
762  dnl  dnl
763  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 750  Line 779 
779    ])    ])
780    
781  MK_BUILD_DIR(rt-seq, sequential, [])  MK_BUILD_DIR(rt-seq, sequential, [])
782  MK_BUILD_DIR(rt-seq-debug, sequential, [debug])  MK_BUILD_DIR(rt-seq-debug, sequentiagetcpul, [debug])
783  MK_BUILD_DIR(rt-par, parallel, [parallel])  MK_BUILD_DIR(rt-par, parallel, [parallel])
784  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])
785    
786    if test x"$LOGGING_ENABLED" = xtrue ; then
787      MK_BUILD_DIR(rt-par-log, parallel, [parallel logging])
788    fi
789    
790  #if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
791  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])
792  #  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.4884

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