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 5072, Fri Jul 14 22:37:27 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"],
# Line 182  Line 190 
190  AC_CHECK_FUNCS(sigtimedwait nanosleep)  AC_CHECK_FUNCS(sigtimedwait nanosleep)
191    
192  dnl  dnl
 dnl check for sched_setaffinity  
 dnl  
 AC_CHECK_FUNCS(sched_setaffinity)  
   
 dnl  
193  dnl check for pthread_setaffinity_np  dnl check for pthread_setaffinity_np
194  dnl  dnl
195  save_LIBS=$LIBS  save_LIBS=$LIBS
# Line 217  Line 220 
220  dnl  dnl
221  AC_CHECK_FILES(/proc/cpuinfo)  AC_CHECK_FILES(/proc/cpuinfo)
222    
223    dnl check for getcpu and/or sched_getcpu
224    dnl
225    hasGetCPU=no;
226    AC_CHECK_HEADERS([linux/getcpu.h])
227    if test "x$ac_cv_header_linux_getcpu_h" = xyes; then
228      AC_CHECK_FUNCS([getcpu])
229      hasGetCPU=yes;
230    else
231      # getcpu is usually called using syscall
232      #
233      AC_MSG_CHECKING([SYS_getcpu])
234      AC_RUN_IFELSE([AC_LANG_SOURCE([[
235        #define _GNU_SOURCE
236        #include <unistd.h>
237        #include <sys/syscall.h>
238        int main () {
239          unsigned cpu, node;
240          return syscall (SYS_getcpu, &cpu, &node, 0);
241        }
242        ]])],[hasGetCPU=yes],[])
243      AC_MSG_RESULT([$hasGetCPU])
244      if test x"$hasGetCPU" = xyes ; then
245        AC_DEFINE([HAVE_SYS_GETCPU],[1],[Define if SYS_getcpu is defined in <sys/syscall.h>])
246      fi
247    fi
248    if test x"$hasGetCPU" != xyes ; then
249    AC_CHECK_FUNCS([sched_getcpu])
250    fi
251    
252  dnl  dnl
253  dnl OS-specific linking issues  dnl OS-specific linking issues
254  dnl  dnl
# Line 252  Line 284 
284  AC_SUBST(LD_NEEDS_RPATH)  AC_SUBST(LD_NEEDS_RPATH)
285  AC_SUBST(LIBM)  AC_SUBST(LIBM)
286    
287    #################### Logging configuration ####################
288    
289    LOGGING_ENABLED=false
290    AC_ARG_ENABLE([event-logging],
291      AC_HELP_STRING([--enable-event-logging], [include event-logging support for parallel target]),
292      [LOGGING_ENABLED=true],
293      [LOGGING_ENABLED=false])
294    
295    AC_SUBST(LOGGING_ENABLED)
296    
297    #################### end Logging configuration ####################
298    
299    #################### Diderot Debugger configuration ####################
300    
301    DEBUGGER_ENABLED=false
302    AC_ARG_ENABLE([debugger],
303      AC_HELP_STRING([--enable-debugger], [build the Diderot debugger (experimental)]),
304      [DEBUGGER_ENABLED=true],
305      [DEBUGGER_ENABLED=false])
306    
307    AC_SUBST(DEBUGGER_ENABLED)
308    
309    #################### end Diderot Debugger configuration ####################
310    
311  #################### CUDA configuration ####################  #################### CUDA configuration ####################
312    
313  AC_ARG_ENABLE([cuda],  AC_ARG_ENABLE([cuda],
# Line 483  Line 539 
539  save_LDFLAGS=$LDFLAGS  save_LDFLAGS=$LDFLAGS
540  save_LIBS=$LIBS  save_LIBS=$LIBS
541  LDFLAGS="$LDFLAGS -L$TEEM_DIR/lib"  LDFLAGS="$LDFLAGS -L$TEEM_DIR/lib"
542  LIBS="$LIBS -lteem"  LIBS="$LIBS -lteem -lm"
543  AC_CHECK_FUNCS([nrrdMetaDataNormalize])  AC_CHECK_FUNCS([nrrdMetaDataNormalize])
544  LDFLAGS=$save_LDFLAGS  LDFLAGS=$save_LDFLAGS
545  LIBS=$save_LIBS  LIBS=$save_LIBS
546    
547  dnl  if test "x$ac_cv_func_nrrdMetaDataNormalize" != xyes; then
548  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"])  
549  fi  fi
550    
551  AC_SUBST(TEEM_DIR)  AC_SUBST(TEEM_DIR)
# Line 544  Line 589 
589    
590    dnl check that we have a compatible version of SML/NJ    dnl check that we have a compatible version of SML/NJ
591    dnl    dnl
592    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])])
593    if test $SMLNJ_MAJOR_VERSION -lt 110 \    if test $SMLNJ_MAJOR_VERSION -lt 110 \
594      -o $SMLNJ_MINOR_VERSION -lt 79      -o $SMLNJ_MINOR_VERSION -lt 80
595    then    then
596      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)])
597    fi    fi
598    
599    dnl determine the heap-image suffix    dnl determine the heap-image suffix
# Line 685  Line 730 
730    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"    src/compiler/Makefile"$COMPILER_MAKEFILE_IN"
731    src/lib/build/Makefile    src/lib/build/Makefile
732    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  
733  dnl  dnl
734  dnl ***** SML source files *****  dnl ***** SML source files *****
735    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 752 
752  AC_CONFIG_FILES([  AC_CONFIG_FILES([
753    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
754  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])  ], [chmod +x src/compiler/gen/fragments/mkmk.sh])
755    
756    dnl
757    dnl additional files for logging tools
758    dnl
759    if test x"$LOGGING_ENABLED" = xtrue ; then
760  AC_CONFIG_FILES([  AC_CONFIG_FILES([
761    src/tests/rtest/scripts/run.sh:src/tests/rtest/scripts/run_sh.in      src/logging/gen/Makefile
762  ], [chmod +x src/tests/rtest/scripts/run.sh])      src/logging/log-analyze/Makefile
763  AC_CONFIG_FILES([      src/logging/log-dump/Makefile
764    src/tests/rtest/scripts/run-one.sh:src/tests/rtest/scripts/run-one_sh.in      src/logging/gen/log-gen.sh:src/logging/gen/log-gen_sh.in
765  ], [chmod +x src/tests/rtest/scripts/run-one.sh])      src/logging/gen/main.sml:src/logging/gen/main_sml.in
766  #      src/logging/lib/default-log-paths.hxx:src/logging/lib/default-log-paths_hxx.in
767  # more regression tests; should merge with rtest at some point    ], [chmod +x src/logging/gen/log-gen.sh])
768  #  fi
 # 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])  
769    
770  dnl  dnl
771  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 748  Line 787 
787    ])    ])
788    
789  MK_BUILD_DIR(rt-seq, sequential, [])  MK_BUILD_DIR(rt-seq, sequential, [])
790  MK_BUILD_DIR(rt-seq-debug, sequential, [debug])  MK_BUILD_DIR(rt-seq-debug, sequentiagetcpul, [debug])
791  MK_BUILD_DIR(rt-par, parallel, [parallel])  MK_BUILD_DIR(rt-par, parallel, [parallel])
792  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])  MK_BUILD_DIR(rt-par-debug, parallel, [parallel debug])
793    
794    if test x"$LOGGING_ENABLED" = xtrue ; then
795      MK_BUILD_DIR(rt-par-log, parallel, [parallel logging])
796    fi
797    
798  #if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
799  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])  #  MK_BUILD_DIR(rt-cl-f, opencl, [float])
800  #  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.5072

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