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 3223, Mon Jul 20 22:21:00 2015 UTC
# Line 120  Line 120 
120    if test x"$HAVE_CL_H" = xno ; then    if test x"$HAVE_CL_H" = xno ; then
121      # check for NVIDIA's SDK      # check for NVIDIA's SDK
122      AC_MSG_CHECKING([for NVIDIA's SDK cl.h])      AC_MSG_CHECKING([for NVIDIA's SDK cl.h])
123      if test -d /usr/local/cuda/include/CL ; then      CUDA_HOME=none
124        for CUDA in cuda cuda-7.0 cuda-6.5 cuda-6.0 ; do
125          if test -d /usr/local/$CUDA/include/CL ; then
126            CUDA_HOME=/usr/local/$CUDA
127            break
128          fi
129        done
130        if test x"$CUDA" != xnone ; then
131        HAVE_CL_H="yes"        HAVE_CL_H="yes"
132          CL_HEADER="$CUDA_HOME/include/CL/cl.h"
133        AC_DEFINE([HAVE_CL_CL_H])        AC_DEFINE([HAVE_CL_CL_H])
134        CPPFLAGS_CL="-I/usr/local/cuda/include"        CPPFLAGS_CL="-I$CUDA_HOME/include"
135      fi      fi
136      AC_MSG_RESULT([$HAVE_CL_H])      AC_MSG_RESULT([$HAVE_CL_H])
137    fi    fi
# Line 149  Line 157 
157  # else  # else
158  #   error no cl.h  #   error no cl.h
159  # endif]],  # endif]],
160  [[#if defined(CL_VERSION_1_1)  [[#if defined(CL_VERSION_1_2)
161    printf("11000\n");    printf("120\n");
162    #elif defined(CL_VERSION_1_1)
163      printf("110\n");
164  #elif defined(CL_VERSION_1_0)  #elif defined(CL_VERSION_1_0)
165    printf("10000\n");    printf("100\n");
166  #else  #else
167    printf("0\n");    printf("0\n");
168  #endif  #endif
# Line 195  Line 205 
205  fi  fi
206  AC_SUBST(CL_ENABLED)  AC_SUBST(CL_ENABLED)
207  AC_SUBST(CL_VERSION)  AC_SUBST(CL_VERSION)
208    AC_DEFINE_UNQUOTED(DIDEROT_CL_VERSION,[$CL_VERSION],[version of OpenCL supported by system])
209    
210  AC_SUBST(SIZEOF_CL_INT)  AC_SUBST(SIZEOF_CL_INT)
211  AC_SUBST(SIZEOF_CL_LONG)  AC_SUBST(SIZEOF_CL_LONG)
# Line 587  Line 598 
598  AC_CONFIG_FILES([  AC_CONFIG_FILES([
599    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in
600  ], [chmod +x rtest/scripts/run-one.sh])  ], [chmod +x rtest/scripts/run-one.sh])
601    #
602    # more regression tests; should merge with rtest at some point
603    #
604    AC_CONFIG_FILES([
605      rtest2/scripts/run.sh:rtest2/scripts/run_sh.in
606    ], [chmod +x rtest2/scripts/run.sh])
607    AC_CONFIG_FILES([
608      rtest2/scripts/run-one.sh:rtest2/scripts/run-one_sh.in
609    ], [chmod +x rtest2/scripts/run-one.sh])
610    
611  dnl  dnl
612  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds

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

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