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

SCM Repository

[diderot] Diff of /branches/vis12/src/include/Diderot/diderot.h
ViewVC logotype

Diff of /branches/vis12/src/include/Diderot/diderot.h

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

revision 1830, Fri Apr 13 13:33:27 2012 UTC revision 1831, Fri Apr 13 13:33:40 2012 UTC
# Line 27  Line 27 
27  # endif  # endif
28  #endif  #endif
29    
30    #ifdef DIDEROT_TARGET_PARALLEL
31    #  include <pthread.h>
32    #endif
33    
34  /* gcc has a bug that breaks code that uses 8-byte vectors (e.g., vec2f_t), but clang  /* gcc has a bug that breaks code that uses 8-byte vectors (e.g., vec2f_t), but clang
35   * handles the code correctly.   * handles the code correctly.
36   */   */
# Line 55  Line 59 
59  #include "world.h"  #include "world.h"
60  #include "strands.h"  #include "strands.h"
61  #include "options.h"  #include "options.h"
 //#include "output.h"  
62    
63  /* load image data from Nrrd files */  /* load image data from Nrrd files */
64  extern Status_t Diderot_SetImage1D (WorldPrefix_t *wrld, Nrrd *nin, Diderot_image1D_t **imgOut);  extern Status_t Diderot_SetImage1D (WorldPrefix_t *wrld, Nrrd *nin, Diderot_image1D_t **imgOut);
# Line 68  Line 71 
71  #include "shadow-types.h"  #include "shadow-types.h"
72  #endif  #endif
73    
74    #ifdef DIDEROT_TARGET_PARALLEL
75  //! Summary information about the CPU configuration.  //! Summary information about the CPU configuration.
76  typedef struct {  typedef struct {
77      int         numHWNodes;             //!< \brief number of (possibly multicore) processors      int         numHWNodes;             //!< \brief number of (possibly multicore) processors
# Line 79  Line 83 
83  } CPUInfo_t;  } CPUInfo_t;
84    
85  //! \brief function to get information about the CPU configuration  //! \brief function to get information about the CPU configuration
86  bool GetNumCPUs (CPUInfo_t *info);  //! \return true if there is an error
87    bool Diderot_GetNumCPUs (CPUInfo_t *info);
88    #endif
89    
90  //! Checked memory allocation  //! Checked memory allocation
91  STATIC_INLINE void *CheckedAlloc (size_t szb)  STATIC_INLINE void *CheckedAlloc (size_t szb)

Legend:
Removed from v.1830  
changed lines
  Added in v.1831

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