Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/vis12/configure.ac
ViewVC logotype

Diff of /branches/vis12/configure.ac

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2747, Wed Oct 1 21:08:57 2014 UTC revision 3349, Tue Oct 27 15:16:36 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 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 587  Line 601 
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

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

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