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 2685, Mon Aug 25 18:58:33 2014 UTC revision 3607, Tue Jan 19 14:56:36 2016 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 103  Line 105 
105    CL_VERSION=0    CL_VERSION=0
106  else  else
107    CL_ENABLED=true    CL_ENABLED=true
108      # we have the OpenCL library, so look for the header file
109    CPPFLAGS_CL=""    CPPFLAGS_CL=""
110    CL_HEADER=""    CL_HEADER=""
111    AC_CHECK_HEADERS([CL/cl.h OpenCL/cl.h], [HAVE_CL_H="yes"; CL_HEADER="$ac_header"; break], [HAVE_CL_H="no"])    AC_CHECK_HEADERS([CL/cl.h OpenCL/cl.h], [HAVE_CL_H="yes"; CL_HEADER="$ac_header"; break], [HAVE_CL_H="no"])
# Line 120  Line 123 
123    if test x"$HAVE_CL_H" = xno ; then    if test x"$HAVE_CL_H" = xno ; then
124      # check for NVIDIA's SDK      # check for NVIDIA's SDK
125      AC_MSG_CHECKING([for NVIDIA's SDK cl.h])      AC_MSG_CHECKING([for NVIDIA's SDK cl.h])
126      if test -d /usr/local/cuda/include/CL ; then      CUDA_HOME=none
127        for CUDA in cuda cuda-7.0 cuda-6.5 cuda-6.0 ; do
128          if test -d /usr/local/$CUDA/include/CL ; then
129            CUDA_HOME=/usr/local/$CUDA
130            break
131          fi
132        done
133        if test x"$CUDA_HOME" != xnone ; then
134        HAVE_CL_H="yes"        HAVE_CL_H="yes"
135          CL_HEADER="$CUDA_HOME/include/CL/cl.h"
136        AC_DEFINE([HAVE_CL_CL_H])        AC_DEFINE([HAVE_CL_CL_H])
137        CPPFLAGS_CL="-I/usr/local/cuda/include"        CPPFLAGS_CL="-I$CUDA_HOME/include"
138      fi      fi
139      AC_MSG_RESULT([$HAVE_CL_H])      AC_MSG_RESULT([$HAVE_CL_H])
140    fi    fi
# Line 149  Line 160 
160  # else  # else
161  #   error no cl.h  #   error no cl.h
162  # endif]],  # endif]],
163  [[#if defined(CL_VERSION_1_1)  [[#if defined(CL_VERSION_1_2)
164    printf("11000\n");    printf("120\n");
165    #elif defined(CL_VERSION_1_1)
166      printf("110\n");
167  #elif defined(CL_VERSION_1_0)  #elif defined(CL_VERSION_1_0)
168    printf("10000\n");    printf("100\n");
169  #else  #else
170    printf("0\n");    printf("0\n");
171  #endif  #endif
# Line 195  Line 208 
208  fi  fi
209  AC_SUBST(CL_ENABLED)  AC_SUBST(CL_ENABLED)
210  AC_SUBST(CL_VERSION)  AC_SUBST(CL_VERSION)
211    AC_DEFINE_UNQUOTED(DIDEROT_CL_VERSION,[$CL_VERSION],[version of OpenCL supported by system])
212    
213  AC_SUBST(SIZEOF_CL_INT)  AC_SUBST(SIZEOF_CL_INT)
214  AC_SUBST(SIZEOF_CL_LONG)  AC_SUBST(SIZEOF_CL_LONG)
# Line 525  Line 539 
539    
540  AH_TOP([  AH_TOP([
541  /*  /*
542   * COPYRIGHT (c) 2011 Diderot project. (http://diderot-language.cs.uchicago.edu)   * This code is part of the Diderot Project (http://diderot-language.cs.uchicago.edu)
543   * All rights reserved.   *
544     * COPYRIGHT (c) 2015 The University of Chicago * All rights reserved.
545   */   */
546    
547  #ifndef _DIDEROT_CONFIG_H_  #ifndef _DIDEROT_CONFIG_H_
# Line 587  Line 602 
602  AC_CONFIG_FILES([  AC_CONFIG_FILES([
603    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in
604  ], [chmod +x rtest/scripts/run-one.sh])  ], [chmod +x rtest/scripts/run-one.sh])
605    #
606    # more regression tests; should merge with rtest at some point
607    #
608    AC_CONFIG_FILES([
609      rtest2/scripts/run.sh:rtest2/scripts/run_sh.in
610    ], [chmod +x rtest2/scripts/run.sh])
611    AC_CONFIG_FILES([
612      rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in
613    ], [chmod +x rtest2/scripts/run-one.sh])
614    
615  dnl  dnl
616  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds

Legend:
Removed from v.2685  
changed lines
  Added in v.3607

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