SCM Repository

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

[diderot] / branches / vis15 / configure.ac

Diff of /branches/vis15/configure.ac

-branches/vis12/configure.ac
revision 1941, Tue Jul  3 15:22:31 2012 UTC
+branches/vis15/configure.ac
revision 3340, Wed Oct 21 22:04:01 2015 UTC
 Line 1
  dnl Process this file with autoconf to produce a configure script.
  dnl
- dnl COPYRIGHT (c) 2012 The Diderot Project
+ dnl This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
+ dnl
+ dnl COPYRIGHT (c) 2015 The University of Chicago
  dnl All rights reserved.
  dnl
  AC_INIT(diderot,0.1,)
  AC_PREREQ(2.60)
- AC_COPYRIGHT([[COPYRIGHT (c) 2012 The Diderot Project (http://diderot-language.cs.uchicago.edu)]])
+ AC_COPYRIGHT([[COPYRIGHT (c) 2015 The University of Chicago]])
- AC_CONFIG_SRCDIR(src/dnorm/dnorm.c)
+ AC_CONFIG_SRCDIR(src/compiler/driver/main.sml)
  AC_CONFIG_AUX_DIR(config)
  AC_CONFIG_MACRO_DIR(config)
-Line 47
+Line 49
    AC_MSG_ERROR([Diderot requires c99 support])
  fi
+ AC_ARG_ENABLE([32-bit],
+   AC_HELP_STRING([--enable-32-bit], [configure Diderot to produce 32-bit executables]),
+   [CFLAG_MXX="-m32"],
+   [CFLAG_MXX="-m64"])
  dnl extra C compiler options
  dnl
  CFLAGS=""
- CFLAG_M64="-m64"
  CFLAGS_BASE="-Wformat -Wreturn-type -Wuninitialized"
- AC_SUBST(CFLAG_M64)
+ AC_SUBST(CFLAG_MXX)
  AC_SUBST(CFLAGS_BASE)
  dnl
-Line 65
+Line 71
  dnl
  ACX_PTHREAD
- dnl check for doxygen
- dnl
- AC_ARG_WITH([doxygen],
-   [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],
-   [DOXYGEN=$with_doxygen],
-   [DOXYGEN=none])
- if test x$DOXYGEN = xnone ; then
-   # see if we can find doxygen in the user's path
-   AC_PATH_PROG(DOXYGEN, [doxygen], [none])
- fi
- if test x$with_doxygen = xyes -o x$with_doxygen = xno ; then
-   AC_MSG_ERROR([--with-doxygen option must specify directory argument])
- elif test x$DOXYGEN != xnone -a ! -x $DOXYGEN ; then
-   AC_MSG_ERROR([doxygen not found at $DOXYGEN])
- elif test x$DOXYGEN != xnone ; then
- dnl
- dnl verify that $DOXYGEN is an absolute path
- dnl
-   case $DOXYGEN in
-     /*) ;;
-     *) AC_MSG_ERROR([--with-doxygen path must be absolute]) ;;
-   esac
- fi
- if test $DOXYGEN = xnone ; then
-   DOXYGEN=:
- fi
- AC_SUBST(DOXYGEN)
  dnl
  dnl Look for NVIDIA's nvcc compiler
  dnl
-Line 128
+Line 106
  else
    CL_ENABLED=true
    CPPFLAGS_CL=""
-   AC_CHECK_HEADERS([CL/cl.h OpenCL/cl.h], [HAVE_CL_H="yes"; break], [HAVE_CL_H="no"])
+   CL_HEADER=""
+   AC_CHECK_HEADERS([CL/cl.h OpenCL/cl.h], [HAVE_CL_H="yes"; CL_HEADER="$ac_header"; break], [HAVE_CL_H="no"])
    if test x"$HAVE_CL_H" = xno ; then
      # check for AMD's SDK
      AC_MSG_CHECKING([for cl.h in AMD's SDK])
      if test -d /opt/AMDAPP/include/CL ; then
        HAVE_CL_H="yes"
+       CL_HEADER="/opt/AMDAPP/include/CL/cl.h"
        AC_DEFINE([HAVE_CL_CL_H])
        CPPFLAGS_CL="-I/opt/AMDAPP/include"
      fi
      AC_MSG_RESULT([$HAVE_CL_H])
    fi
    if test x"$HAVE_CL_H" = xno ; then
+     # check for NVIDIA's SDK
+     AC_MSG_CHECKING([for NVIDIA's SDK cl.h])
+     CUDA_HOME=none
+     for CUDA in cuda cuda-7.0 cuda-6.5 cuda-6.0 ; do
+       if test -d /usr/local/$CUDA/include/CL ; then
+         CUDA_HOME=/usr/local/$CUDA
+         break
+       fi
+     done
+     if test x"$CUDA" != xnone ; then
+       HAVE_CL_H="yes"
+       CL_HEADER="$CUDA_HOME/include/CL/cl.h"
+       AC_DEFINE([HAVE_CL_CL_H])
+       CPPFLAGS_CL="-I$CUDA_HOME/include"
+     fi
+     AC_MSG_RESULT([$HAVE_CL_H])
+   fi
+   if test x"$HAVE_CL_H" = xno ; then
      AC_MSG_WARN([no cl.h found])
      CL_ENABLED=false
      CL_VERSION=0
+     SIZEOF_CL_INT=0
+     SIZEOF_CL_LONG=0
+     SIZEOF_CL_FLOAT=0
+     SIZEOF_CL_DOUBLE=0
    else
      # check the cl.h header for which version of OpenCL is supported
      AC_LANG([C])
-Line 157
+Line 159
  # else
  #   error no cl.h
  # endif]],
- [[#if defined(CL_VERSION_1_1)
+ [[#if defined(CL_VERSION_1_2)
-   printf("11000\n");
+   printf("120\n");
+ #elif defined(CL_VERSION_1_1)
+   printf("110\n");
  #elif defined(CL_VERSION_1_0)
-   printf("10000\n");
+   printf("100\n");
  #else
    printf("0\n");
  #endif
-Line 171
+Line 175
  dnl the specification specifies the behavior, but it was unspecified in 1.0.
  dnl
      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- # ifdef HAVE_CL_CL_H
+ #include "$CL_HEADER"
- #   include <CL/cl.h>
+ ]],
- # elif defined(HAVE_OPENCL_CL_H)
- #   include <OpenCL/cl.h>
- # else
- #   error no cl.h
- # endif]],
        [[cl_float4 x; x[0] = 0.0;]])],
        [AC_DEFINE([CL_HOST_VECTORS_ARE_ARRAYS],[1],[host vector types are arrays])],
  dnl
  dnl not arrays, so try the OpenCL 1.1 structure representation
  dnl
        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- # ifdef HAVE_CL_CL_H
+ #include "$CL_HEADER"
- #   include <CL/cl.h>
+ ]],
- # elif defined(HAVE_OPENCL_CL_H)
- #   include <OpenCL/cl.h>
- # else
- #   error no cl.h
- # endif]],
        [[cl_float4 x; x.s[0] = 0.0;]])],
        [AC_DEFINE([CL_HOST_VECTORS_ARE_STRUCTS],[1],[host vector types are structs])],
        [AC_MSG_ERROR([unable to figure out host types for OpenCL vectors])])])
-Line 199
+Line 193
    # substitutions
      AC_SUBST(LIBS_CL)
      AC_SUBST(CPPFLAGS_CL)
+   #
+   # determine the sizes of the host-side OpenCL types
+   AC_CHECK_SIZEOF([cl_int], [], [#include "$CL_HEADER"])
+   SIZEOF_CL_INT=$ac_cv_sizeof_cl_int
+   AC_CHECK_SIZEOF([cl_long], [], [#include "$CL_HEADER"])
+   SIZEOF_CL_LONG=$ac_cv_sizeof_cl_long
+   AC_CHECK_SIZEOF([cl_float], [], [#include "$CL_HEADER"])
+   SIZEOF_CL_FLOAT=$ac_cv_sizeof_cl_float
+   AC_CHECK_SIZEOF([cl_double], [], [#include "$CL_HEADER"])
+   SIZEOF_CL_DOUBLE=$ac_cv_sizeof_cl_double
    fi
  fi
  AC_SUBST(CL_ENABLED)
  AC_SUBST(CL_VERSION)
+ AC_DEFINE_UNQUOTED(DIDEROT_CL_VERSION,[$CL_VERSION],[version of OpenCL supported by system])
+ AC_SUBST(SIZEOF_CL_INT)
+ AC_SUBST(SIZEOF_CL_LONG)
+ AC_SUBST(SIZEOF_CL_FLOAT)
+ AC_SUBST(SIZEOF_CL_DOUBLE)
  dnl
  dnl check for various library routines etc.
-Line 312
+Line 322
  AC_SUBST(LIBM)
  dnl
- dnl get the path to the TEEM installation
+ dnl get the path to the TEEM installation.  We need this to build the Diderot
+ dnl runtime code and we use the path when searching for teem in the Diderot
+ dnl compiler.
  dnl
  AC_ARG_WITH(teem,
    AC_HELP_STRING([--with-teem=<path>], [specify path to teem installation]),
-Line 329
+Line 341
      TEEM_DIR=$ac_cv_use_teem
      # check that TEEM_DIR actually points to something that looks like teem
      if test -f $TEEM_DIR/include/teem/nrrd.h ; then
-       AC_MSG_RESULT([ okay])
+       AC_MSG_RESULT([yes])
      else
        TEEM_DIR=none
-       AC_MSG_RESULT([ invalid])
+       AC_MSG_RESULT([no])
      fi
    else
      TEEM_DIR=none
-     AC_MSG_RESULT([ invalid])
+     AC_MSG_RESULT([no])
    fi
  fi
  if test x"$TEEM_DIR" = xnone ; then
-   AC_MSG_ERROR([unable to find teem])
+   AC_MSG_ERROR([unable to find teem; use --with-teem option to specify location])
+ fi
+ dnl
+ dnl check that unu supports the dnorm command
+ dnl
+ if test x"$TEEM_DIR" != xnone ; then
+   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"])
+   fi
  fi
  AC_SUBST(TEEM_DIR)
-Line 351
+Line 379
  dnl
  CHECK_SMLNJ([AC_MSG_ERROR([unable to find SML/NJ installation; check your PATH or set SMLNJ_CMD])])
  if test $SMLNJ_MAJOR_VERSION -lt 110 \
-   -o $SMLNJ_MINOR_VERSION -lt 73
+   -o $SMLNJ_MINOR_VERSION -lt 79
  then
-   AC_MSG_ERROR([installation requires SML/NJ version 110.73+])
+   AC_MSG_ERROR([installation requires SML/NJ version 110.79+ (available from smlnj.org)])
  fi
  AC_SUBST(SMLNJ_VERSION)
-Line 384
+Line 412
  fi
  AC_SUBST(ML_BUILD)
+ dnl ******************** Documentation tools ********************
+ dnl check for doxygen
+ dnl
+ AC_ARG_WITH([doxygen],
+   [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],
+   [DOXYGEN=$with_doxygen],
+   [DOXYGEN=none])
+ if test x$DOXYGEN = xnone ; then
+   # see if we can find doxygen in the user's path
+   AC_PATH_PROG(DOXYGEN, [doxygen], [none])
+ fi
+ if test x$with_doxygen = xyes -o x$with_doxygen = xno ; then
+   AC_MSG_ERROR([--with-doxygen option must specify directory argument])
+ elif test x$DOXYGEN != xnone -a ! -x $DOXYGEN ; then
+   AC_MSG_ERROR([doxygen not found at $DOXYGEN])
+ elif test x$DOXYGEN != xnone ; then
+ dnl
+ dnl verify that $DOXYGEN is an absolute path
+ dnl
+   case $DOXYGEN in
+     /*) ;;
+     *) AC_MSG_ERROR([--with-doxygen path must be absolute]) ;;
+   esac
+ fi
+ if test $DOXYGEN = xnone ; then
+   DOXYGEN=:
+ fi
+ AC_SUBST(DOXYGEN)
+ dnl check for asciidoc and related tools
+ dnl
+ AC_PATH_PROGS([ASCIIDOC], [asciidoc], [none])
+ AC_PATH_PROGS([A2X], [a2x], [none])
+ AC_PATH_PROGS([HIGHLIGHTER], [pygmentize], [none])
+ AC_PATH_PROGS([DBLATEX], [dblatex], [none])
+ dnl
+ dnl get the path to the asciidoc cofiguration files
+ dnl
+ if test x"$ASCIIDOC" != xnone ; then
+   AC_MSG_CHECKING([path to asciidoc configuration files])
+   ASCIIDOC_CONF_DIR=`$ASCIIDOC -v /dev/null 2>&1 | head -n 1 | sed 's|.*reading: \(.*\)/asciidoc.conf|\1|'`
+   AC_MSG_RESULT([$ASCIIDOC_CONF_DIR])
+ fi
+ AC_SUBST(ASCIIDOC)
+ AC_SUBST(A2X)
+ AC_SUBST(ASCIIDOC_CONF_DIR)
+ AC_SUBST(HIGHLIGHTER)
+ AC_SUBST(DBLATEX)
  dnl ******************** Paths ********************
  DIDEROT_ROOT=`pwd`
-Line 413
+Line 493
  dnl run the compiler tests in 64-bit mode
  dnl
  save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS $CFLAG_M64"
+ CFLAGS="$CFLAGS $CFLAG_MXX"
  dnl
  dnl check for gcc builtin atomic operations
-Line 429
+Line 509
  AC_C_BIGENDIAN
+ #
+ # determine the sizes of the standard C types
+ AC_CHECK_SIZEOF([int])
+ SIZEOF_C_INT=$ac_cv_sizeof_int
+ AC_CHECK_SIZEOF([long])
+ SIZEOF_C_LONG=$ac_cv_sizeof_long
+ AC_CHECK_SIZEOF([float])
+ SIZEOF_C_FLOAT=$ac_cv_sizeof_float
+ AC_CHECK_SIZEOF([double])
+ SIZEOF_C_DOUBLE=$ac_cv_sizeof_double
+ AC_SUBST(SIZEOF_C_INT)
+ AC_SUBST(SIZEOF_C_LONG)
+ AC_SUBST(SIZEOF_C_FLOAT)
+ AC_SUBST(SIZEOF_C_DOUBLE)
  dnl
  dnl restore CFLAGS
  dnl
-Line 442
+Line 538
  AH_TOP([
  /*
-  * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)
+  * COPYRIGHT (c) 2014 Diderot project. (http://diderot-language.cs.uchicago.edu)
   * All rights reserved.
   */
-Line 452
+Line 548
  ])
  AH_BOTTOM([
+ #ifdef NDEBUG
+ #define STATIC_INLINE   static inline
+ #else
+ #define STATIC_INLINE   static
+ #endif
  #endif /* !_DIDEROT_CONFIG_H_ */
  ])
-Line 464
+Line 566
  dnl ***** Makefiles *****
    Makefile
    doc/Makefile
+   doc/man/Makefile
    src/clinfo/Makefile
-   src/dnorm/Makefile
    src/compiler/Makefile
    src/lib/build/Makefile
    src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in
-Line 476
+Line 578
    test/hlic/Makefile
  dnl
  dnl ***** SML source files *****
-   src/compiler/fields/run-dnorm.sml:src/compiler/fields/run-dnorm_sml.in
+   src/compiler/nrrd/run-dnorm.sml:src/compiler/nrrd/run-dnorm_sml.in
    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in
+   src/compiler/common/size-of.sml:src/compiler/common/size-of_sml.in
  )
  AC_CONFIG_HEADERS(src/include/Diderot/config.h:config/config_h.in)
-Line 497
+Line 600
  AC_CONFIG_FILES([
    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in
  ], [chmod +x 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])
  dnl
  dnl generate makefiles for runtime library builds

 Legend:



Removed from v.1941
 


changed lines


 
Added in v.3340
 Legend:



Removed from v.1941
 


changed lines


 
Added in v.3340
-Removed from v.1941
+Added in v.3340

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