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

branches/vis12/configure.ac revision 2747, Wed Oct 1 21:08:57 2014 UTC branches/vis15/configure.ac revision 3348, Tue Oct 27 15:13:58 2015 UTC
# Line 1  Line 1 
1  dnl Process this file with autoconf to produce a configure script.  dnl Process this file with autoconf to produce a configure script.
2  dnl  dnl
3  dnl COPYRIGHT (c) 2014 The Diderot Project  dnl This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
4    dnl
5    dnl COPYRIGHT (c) 2015 The University of Chicago
6  dnl All rights reserved.  dnl All rights reserved.
7  dnl  dnl
8    
9  AC_INIT(diderot,0.1,)  AC_INIT(diderot,0.1,)
10    
11  AC_PREREQ(2.60)  AC_PREREQ(2.60)
12  AC_COPYRIGHT([[COPYRIGHT (c) 2014 The Diderot Project (http://diderot-language.cs.uchicago.edu)]])  AC_COPYRIGHT([[COPYRIGHT (c) 2015 The University of Chicago]])
13  AC_CONFIG_SRCDIR(src/compiler/driver/main.sml)  AC_CONFIG_SRCDIR(src/compiler/driver/main.sml)
14  AC_CONFIG_AUX_DIR(config)  AC_CONFIG_AUX_DIR(config)
15  AC_CONFIG_MACRO_DIR(config)  AC_CONFIG_MACRO_DIR(config)
# Line 120  Line 122 
122    if test x"$HAVE_CL_H" = xno ; then    if test x"$HAVE_CL_H" = xno ; then
123      # check for NVIDIA's SDK      # check for NVIDIA's SDK
124      AC_MSG_CHECKING([for NVIDIA's SDK cl.h])      AC_MSG_CHECKING([for NVIDIA's SDK cl.h])
125      if test -d /usr/local/cuda/include/CL ; then      CUDA_HOME=none
126        for CUDA in cuda cuda-7.0 cuda-6.5 cuda-6.0 ; do
127          if test -d /usr/local/$CUDA/include/CL ; then
128            CUDA_HOME=/usr/local/$CUDA
129            break
130          fi
131        done
132        if test x"$CUDA" != xnone ; then
133        HAVE_CL_H="yes"        HAVE_CL_H="yes"
134          CL_HEADER="$CUDA_HOME/include/CL/cl.h"
135        AC_DEFINE([HAVE_CL_CL_H])        AC_DEFINE([HAVE_CL_CL_H])
136        CPPFLAGS_CL="-I/usr/local/cuda/include"        CPPFLAGS_CL="-I$CUDA_HOME/include"
137      fi      fi
138      AC_MSG_RESULT([$HAVE_CL_H])      AC_MSG_RESULT([$HAVE_CL_H])
139    fi    fi
# Line 149  Line 159 
159  # else  # else
160  #   error no cl.h  #   error no cl.h
161  # endif]],  # endif]],
162  [[#if defined(CL_VERSION_1_1)  [[#if defined(CL_VERSION_1_2)
163    printf("11000\n");    printf("120\n");
164    #elif defined(CL_VERSION_1_1)
165      printf("110\n");
166  #elif defined(CL_VERSION_1_0)  #elif defined(CL_VERSION_1_0)
167    printf("10000\n");    printf("100\n");
168  #else  #else
169    printf("0\n");    printf("0\n");
170  #endif  #endif
# Line 195  Line 207 
207  fi  fi
208  AC_SUBST(CL_ENABLED)  AC_SUBST(CL_ENABLED)
209  AC_SUBST(CL_VERSION)  AC_SUBST(CL_VERSION)
210    AC_DEFINE_UNQUOTED(DIDEROT_CL_VERSION,[$CL_VERSION],[version of OpenCL supported by system])
211    
212  AC_SUBST(SIZEOF_CL_INT)  AC_SUBST(SIZEOF_CL_INT)
213  AC_SUBST(SIZEOF_CL_LONG)  AC_SUBST(SIZEOF_CL_LONG)
# Line 366  Line 379 
379  dnl  dnl
380  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; check your PATH or set SMLNJ_CMD])])
381  if test $SMLNJ_MAJOR_VERSION -lt 110 \  if test $SMLNJ_MAJOR_VERSION -lt 110 \
382    -o $SMLNJ_MINOR_VERSION -lt 77    -o $SMLNJ_MINOR_VERSION -lt 79
383  then  then
384    AC_MSG_ERROR([installation requires SML/NJ version 110.77+ (available from smlnj.org)])    AC_MSG_ERROR([installation requires SML/NJ version 110.79+ (available from smlnj.org)])
385  fi  fi
386  AC_SUBST(SMLNJ_VERSION)  AC_SUBST(SMLNJ_VERSION)
387    
# Line 525  Line 538 
538    
539  AH_TOP([  AH_TOP([
540  /*  /*
541   * COPYRIGHT (c) 2014 Diderot project. (http://diderot-language.cs.uchicago.edu)   * This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
542   * All rights reserved.   *
543     * COPYRIGHT (c) 2015 The University of Chicago * All rights reserved.
544   */   */
545    
546  #ifndef _DIDEROT_CONFIG_H_  #ifndef _DIDEROT_CONFIG_H_
# Line 552  Line 566 
566  dnl  dnl
567  dnl ***** Makefiles *****  dnl ***** Makefiles *****
568    Makefile    Makefile
569    doc/Makefile  dnl  doc/Makefile
570    doc/man/Makefile  dnl  doc/man/Makefile
571    src/clinfo/Makefile  dnl  src/clinfo/Makefile
572    src/compiler/Makefile  dnl  src/compiler/Makefile
573    src/lib/build/Makefile  dnl  src/lib/build/Makefile
574    src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in  dnl  src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in
575    test/MIP/Makefile  dnl  test/MIP/Makefile
576    test/probe/Makefile  dnl  test/probe/Makefile
577    test/iso2d-polyline/Makefile  dnl  test/iso2d-polyline/Makefile
578    test/vr-lite-cam/Makefile  dnl  test/vr-lite-cam/Makefile
579    test/hlic/Makefile  dnl  test/hlic/Makefile
580  dnl  dnl
581  dnl ***** SML source files *****  dnl ***** SML source files *****
582    src/compiler/nrrd/run-dnorm.sml:src/compiler/nrrd/run-dnorm_sml.in  dnl  src/compiler/nrrd/run-dnorm.sml:src/compiler/nrrd/run-dnorm_sml.in
583    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in    src/compiler/common/paths.sml:src/compiler/common/paths_sml.in
584    src/compiler/common/size-of.sml:src/compiler/common/size-of_sml.in    src/compiler/common/size-of.sml:src/compiler/common/size-of_sml.in
585  )  )
# Line 578  Line 592 
592  AC_CONFIG_FILES([  AC_CONFIG_FILES([
593    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in
594  ], [chmod +x bin/install-sml-wrapper.sh])  ], [chmod +x bin/install-sml-wrapper.sh])
595  AC_CONFIG_FILES([  # AC_CONFIG_FILES([
596    src/compiler/gen/file2str/file2str.sh:src/compiler/gen/file2str/file2str_sh.in  #   src/compiler/gen/file2str/file2str.sh:src/compiler/gen/file2str/file2str_sh.in
597  ], [chmod +x src/compiler/gen/file2str/file2str.sh])  # ], [chmod +x src/compiler/gen/file2str/file2str.sh])
598  AC_CONFIG_FILES([  # AC_CONFIG_FILES([
599    rtest/scripts/run.sh:rtest/scripts/run_sh.in  #   rtest/scripts/run.sh:rtest/scripts/run_sh.in
600  ], [chmod +x rtest/scripts/run.sh])  # ], [chmod +x rtest/scripts/run.sh])
601  AC_CONFIG_FILES([  # AC_CONFIG_FILES([
602    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in  #   rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in
603  ], [chmod +x rtest/scripts/run-one.sh])  # ], [chmod +x rtest/scripts/run-one.sh])
604    #
605    # more regression tests; should merge with rtest at some point
606    #
607    # AC_CONFIG_FILES([
608    #   rtest2/scripts/run.sh:rtest2/scripts/run_sh.in
609    # ], [chmod +x rtest2/scripts/run.sh])
610    # AC_CONFIG_FILES([
611    #   rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in
612    # ], [chmod +x rtest2/scripts/run-one.sh])
613    
614  dnl  dnl
615  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 605  Line 628 
628      AC_CONFIG_FILES(src/lib/build/$1/Makefile)      AC_CONFIG_FILES(src/lib/build/$1/Makefile)
629    ])    ])
630    
631  MK_BUILD_DIR(rt-c-f, c, [float])  #MK_BUILD_DIR(rt-c-f, c, [float])
632  MK_BUILD_DIR(rt-c-d, c, [double])  #MK_BUILD_DIR(rt-c-d, c, [double])
633  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])  #MK_BUILD_DIR(rt-c-f-debug, c, [float debug])
634  MK_BUILD_DIR(rt-c-d-debug, c, [double debug])  #MK_BUILD_DIR(rt-c-d-debug, c, [double debug])
635  MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])  #MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])
636  MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])  #MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])
637  MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])  #MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])
638  MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])  #MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])
639    
640  if test x"$CL_ENABLED" = xtrue ; then  #if test x"$CL_ENABLED" = xtrue ; then
641    MK_BUILD_DIR(rt-cl-f, cl, [float])  #  MK_BUILD_DIR(rt-cl-f, cl, [float])
642    MK_BUILD_DIR(rt-cl-d, cl, [double])  #  MK_BUILD_DIR(rt-cl-d, cl, [double])
643    MK_BUILD_DIR(rt-cl-f-debug, cl, [float debug])  #  MK_BUILD_DIR(rt-cl-f-debug, cl, [float debug])
644    MK_BUILD_DIR(rt-cl-d-debug, cl, [double debug])  #  MK_BUILD_DIR(rt-cl-d-debug, cl, [double debug])
645  fi  #fi
646    
647  AC_OUTPUT  AC_OUTPUT

Legend:
Removed from v.2747  
changed lines
  Added in v.3348

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