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

SCM Repository

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

Diff of /branches/cuda/configure.ac

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

trunk/configure.ac revision 1367, Wed Jun 22 18:40:52 2011 UTC branches/cuda/configure.ac 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) 2010 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    
 dnl NOTE: MANTICORE_DIST_VERSION is an M4 variable defined in config/aclocal.m4  
 dnl  
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) 2010 The Diderot Project (http://diderot-language.cs.uchicago.edu)]])  AC_COPYRIGHT([[COPYRIGHT (c) 2015 The University of Chicago]])
13  AC_CONFIG_SRCDIR(src/dnorm/dnorm.c)  AC_CONFIG_SRCDIR(src/dnorm/dnorm.c)
14  AC_CONFIG_AUX_DIR(config)  AC_CONFIG_AUX_DIR(config)
15  AC_CONFIG_MACRO_DIR(config)  AC_CONFIG_MACRO_DIR(config)
# Line 54  Line 54 
54  dnl  dnl
55  ACX_PTHREAD()  ACX_PTHREAD()
56    
57    dnl check for doxygen
58    dnl
59    AC_ARG_WITH([doxygen],
60      [AS_HELP_STRING([--with-doxygen=PATH], [specify location of doxygen executable])],
61      [DOXYGEN=$with_doxygen],
62      [DOXYGEN=none])
63    if test x$DOXYGEN = xnone ; then
64      # see if we can find doxygen in the user's path
65      AC_PATH_PROG(DOXYGEN, [doxygen], [none])
66    fi
67    if test x$with_doxygen = xyes -o x$with_doxygen = xno ; then
68      AC_MSG_ERROR([--with-doxygen option must specify directory argument])
69    elif test x$DOXYGEN != xnone -a ! -x $DOXYGEN ; then
70      AC_MSG_ERROR([doxygen not found at $DOXYGEN])
71    elif test x$DOXYGEN != xnone ; then
72    dnl
73    dnl verify that $DOXYGEN is an absolute path
74    dnl
75      case $DOXYGEN in
76        /*) ;;
77        *) AC_MSG_ERROR([--with-doxygen path must be absolute]) ;;
78      esac
79    fi
80    if test $DOXYGEN = xnone ; then
81      DOXYGEN=:
82    fi
83    AC_SUBST(DOXYGEN)
84    
85  dnl  dnl
86  dnl Look for NVIDIA's nvcc compiler  dnl Look for NVIDIA's nvcc compiler
87  dnl  dnl
# Line 109  Line 137 
137  #endif  #endif
138      ]])],      ]])],
139      [CL_VERSION=`./conftest$EXEEXT`], [CL_VERSION=0])      [CL_VERSION=`./conftest$EXEEXT`], [CL_VERSION=0])
140    dnl
141    dnl check to see how we access the host-side vector types.  For OpenCL 1.1,
142    dnl the specification specifies the behavior, but it was unspecified in 1.0.
143    dnl
144      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
145    # ifdef HAVE_CL_CL_H
146    #   include <CL/cl.h>
147    # elif defined(HAVE_OPENCL_CL_H)
148    #   include <OpenCL/cl.h>
149    # else
150    #   error no cl.h
151    # endif]],
152        [[cl_float4 x; x[0] = 0.0;]])],
153        [AC_DEFINE([CL_HOST_VECTORS_ARE_ARRAYS],[1],[host vector types are arrays])],
154    dnl
155    dnl not arrays, so try the OpenCL 1.1 structure representation
156    dnl
157        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
158    # ifdef HAVE_CL_CL_H
159    #   include <CL/cl.h>
160    # elif defined(HAVE_OPENCL_CL_H)
161    #   include <OpenCL/cl.h>
162    # else
163    #   error no cl.h
164    # endif]],
165        [[cl_float4 x; x.s[0] = 0.0;]])],
166        [AC_DEFINE([CL_HOST_VECTORS_ARE_STRUCTS],[1],[host vector types are structs])],
167        [AC_MSG_ERROR([unable to figure out host types for OpenCL vectors])])])
168    # substitutions    # substitutions
169    AC_SUBST(CL_LIBS)    AC_SUBST(CL_LIBS)
170  fi  fi
# Line 353  Line 409 
409    
410  AH_TOP([  AH_TOP([
411  /*  /*
412   * 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)
413   * All rights reserved.   *
414     * COPYRIGHT (c) 2015 The University of Chicago * All rights reserved.
415   */   */
416    
417  #ifndef _DIDEROT_CONFIG_H_  #ifndef _DIDEROT_CONFIG_H_
# Line 374  Line 431 
431  dnl  dnl
432  dnl ***** Makefiles *****  dnl ***** Makefiles *****
433    Makefile    Makefile
434      doc/Makefile
435      src/clinfo/Makefile
436    src/dnorm/Makefile    src/dnorm/Makefile
437    src/compiler/Makefile    src/compiler/Makefile
438    src/lib/build/Makefile    src/lib/build/Makefile
439    src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in    src/lib/build/mk/build.gmk:src/lib/build/mk/build_gmk.in
440    test/MIP/Makefile    test/MIP/Makefile
441    test/probe/Makefile    test/probe/Makefile
   test/teem/Makefile  
 dnl  
 dnl ***** CM files *****  
   src/compiler/codegen/sources.cm:src/compiler/codegen/sources_cm.in  
442  dnl  dnl
443  dnl ***** SML source files *****  dnl ***** SML source files *****
444    src/compiler/fields/run-dnorm.sml:src/compiler/fields/run-dnorm_sml.in    src/compiler/fields/run-dnorm.sml:src/compiler/fields/run-dnorm_sml.in
# Line 399  Line 454 
454    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in    bin/install-sml-wrapper.sh:config/install-sml-wrapper_sh.in
455  ], [chmod +x bin/install-sml-wrapper.sh])  ], [chmod +x bin/install-sml-wrapper.sh])
456  AC_CONFIG_FILES([  AC_CONFIG_FILES([
457    rtest/scripts/run-one.sh:rtest/scripts/run-one_sh.in    src/compiler/gen/file2str/file2str.sh:src/compiler/gen/file2str/file2str_sh.in
458  ], [chmod +x rtest/scripts/run-one.sh])  ], [chmod +x src/compiler/gen/file2str/file2str.sh])
 AC_CONFIG_FILES([  
   rtest/scripts/run.sh:rtest/scripts/run_sh.in  
 ], [chmod +x rtest/scripts/run.sh])  
459    
460  dnl  dnl
461  dnl generate makefiles for runtime library builds  dnl generate makefiles for runtime library builds
# Line 423  Line 475 
475    ])    ])
476    
477  MK_BUILD_DIR(rt-c-f, c, [float])  MK_BUILD_DIR(rt-c-f, c, [float])
478    MK_BUILD_DIR(rt-c-d, c, [double])
479  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])  MK_BUILD_DIR(rt-c-f-debug, c, [float debug])
480    MK_BUILD_DIR(rt-c-d-debug, c, [double debug])
481  MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])  MK_BUILD_DIR(rt-c-f-par, parallel, [parallel float])
482    MK_BUILD_DIR(rt-c-d-par, parallel, [parallel double])
483  MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])  MK_BUILD_DIR(rt-c-f-par-debug, parallel, [parallel float debug])
484    MK_BUILD_DIR(rt-c-d-par-debug, parallel, [parallel double debug])
485    
486    if test x"$CL_ENABLED" = xtrue ; then
487      MK_BUILD_DIR(rt-cl-f, cl, [float])
488      MK_BUILD_DIR(rt-cl-d, cl, [double])
489      MK_BUILD_DIR(rt-cl-f-debug, cl, [float debug])
490      MK_BUILD_DIR(rt-cl-d-debug, cl, [double debug])
491    fi
492    
493  AC_OUTPUT  AC_OUTPUT

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

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