Directory include/sci_defs/

Lines of Code

Developers

Most Recent Commits

dav 2014-11-13 21:24 Rev.: 52714

- Fixes for OP X Yosemite and a few minor other fixes. Tested on old OSX and 3 flavors of Linux including GPUs.

M configure.ac
M configure

- Fix excess spew from clang compiler during configure.
- Check for version 14 of OS x (Yosemite).
- Removed 'atlas' check under Darwin as it was actually a blas check.
- Put in checks for Blas and Lapack for old and new (yosemite) OS X.

M aclocal.m4

- Fix shell script output error when used in configure to show the results of `basename $1`.
- Clang compiler uses both stderr and stdout (sigh), and outputs in a different order then
other compilers (for --version). This commit handles this.
- Quote a few variables so that if they are blank, the shell doesn't give warning messages.

M include/sci_defs/blas_testdefs.h.in

- Fix to handle new/old OS X and other OSes in a cleaner manner.

M CCA/Components/Parent/sub.mk

- Arches now uses Boost (in Arches.h), so Parent needs to know to compile against boost.

M CCA/Components/Arches/Arches.h

- Move #if guards for multiple inclusion to the top of file so that the compiler has to do less work.
- Alphabetize #includes so I can see what is there.
- #include boost/shared_prt as it is used in this file.

M CCA/Components/Arches/Transport/URHS.h

- One of our compilers errored on the excessive use of 'typename', so trimmed back a little.

M CCA/Components/Arches/sub.mk

- Remove tabs, lined up, alphabetized, removed old crud.

M Core/Thread/ThreadLock.h

- Move #if guard for multiple inclusion to the top of file so that the compiler has to do less work.
- Fixed spelling in #if guard: Threadlock updated to ThreadLock (capital L).
- Lined things up a little.

M Core/DataArchive/DataArchive.h

- Cosmetic lineup of variables.

M Core/DataArchive/DataArchive.cc

- Cosmetic white space and coding standards update,
don't use "std::" if using "using namespace std".

6 lines of code changed in 2 files:

• include/sci_defs: blas_testdefs.h.in (new)

jsutherland 2014-11-13 18:09 Rev.: 52713

Revert Jeremy's commit that changed the build system for Yosemite.
This caused build failures on several existing systems.

4 lines of code changed in 1 file:

• include/sci_defs: blas_testdefs.h.in (+4 -7)

jthornoc 2014-11-13 17:44 Rev.: 52711

** Dav **
Fixes to the build system to get Uintah building under Yosemite. Changed:
include/sci_defs/blas_testdefs.h.in
configure.ac
configure

** Dav **
Fixed a typo:
Core/Thread/ThreadLock.h

7 lines of code changed in 1 file:

• include/sci_defs: blas_testdefs.h.in (+7 -4)

ahumphrey 2014-10-13 15:11 Rev.: 52568

* Fix static build for IPM library support. For dynamic linking with IPM, report configure message about using LD_PRELOAD
* Generate new configure script
* No headers for IPM, so removed #include from ipm_testdefs.h.in

* Remove a few straggler pieces of windows support in build_scripts directory

0 lines of code changed in 2 files:

• include/sci_defs: ipm_testdefs.h.in (-3)

ahumphrey 2014-10-10 10:35 Rev.: 52566

Add build system support for IPM profiling library (http://ipm-hpc.org/).
Also generate new configure script.

35 lines of code changed in 1 file:

• include/sci_defs: ipm_testdefs.h.in (+35)

dav 2014-06-18 17:21 Rev.: 51996

Fix for static build when GPU (NVCC) is turned on. If you have
external device specific functions in .cu files, then you need to link
them with the -dc (in addition to the -c) flag. Then you have to link
all of these files together in a separate step using the nvcc
compiler's -dlink flag. This update removes the compilation of .cu
files in multiple other files (which thus created multiple definitions
of the same symbols).

I've created a new faux library lib/libgpu_extra_link.a that holds the
output from the -dlink command, and this is linked into sus.

M configVars.mk.in

- Added "-dc" to the nvcc link line.

M Makefile.in

- Build lib/libgpu_extra_link.a if Static and CUDA.

M StandAlone/sub.mk

- Sus now depends on lib/libgpu_extra_link.a (if Static/CUDA).

M include/sci_defs/cuda_testdefs.h.in

- Cosmetic fixes: cleaned up indentation and a few comments.

M CCA/Components/Models/Radiation/RMCRT/RayGPUKernel.cu

- No longer include the .cu files, just include the .h file.

M CCA/Components/Solvers/sub.mk

- Cosmetic fixes: Alphabetize, remove duplicate libs, consolidate if's.

M CCA/Components/Schedulers/GPUDataWarehouse.h

- Cosmetic fixes, clean up spacing, make easier to read.
- Remove unnecessary ;'s after constructor/destructor.

M CCA/Components/Schedulers/UnifiedScheduler.cc

- Indent.
- Group common variables.

M CCA/Components/Arches/sub.mk

- Cosmetic fixes: Cleanup, Indentation, consolidate if's.

M Core/Util/GPU.h

- Fix namespace: uintah -> Uintah
- isThread0_Blk0() is an external function, declare it as such.

M Core/Util/GPU.cu

- Fix namespace: uintah -> Uintah
- Fix function specification layout.

42 lines of code changed in 2 files:

• include/sci_defs: cuda_testdefs.h.in (new)

jas 2014-06-11 15:48 Rev.: 51960

Add include files for pidx/visus.

73 lines of code changed in 2 files:

• include/sci_defs: pidx_testdefs.h.in (new 37), visus_testdefs.h.in (new 36)

dav 2014-05-21 16:19 Rev.: 51858

Need to make sure the dsyev routine uses the appropriate underscore convention...

12 lines of code changed in 2 files:

• include/sci_defs: uintah_testdefs.h.in (new)

harman 2014-05-06 16:27 Rev.: 51809

Fix for inconsistencies with the namespace boost uses for its
filesystem utilities. I had originally seen this on Vulcan, but have
duplicated it on Todd's Debian system Fin. On Fin there are two
versions of boost installed. While the both claim to be using the
boost filesystem version 3, only one of them actually uses the
namespace boost::filesystem3... The other, and the default on many
machines, is boost::filesystem.

I have added a test in configure to determine which namespace to use
and then updated the code to make the correct choice. I have tested
this on Fin, and will verify that it works on other systems after
this commit (in addition to letting the RT take a swing at it too).

- Dav


M src/configure.ac
M src/configure

- Remove the include dir with_boost/include/boost as the '/boost'
comes from the #include line.
- Added check for namespace boost::filesystem3.

M src/build_scripts/build_wasatch_3p.sh

- If boost in in the default /usr location, then don't use CMAKE boost
flags.

M src/include/sci_defs/boost_testdefs.h.in

- Add "#define UINTAH_BOOST_FILESYSTEM_NAMESPACE_V3 1" as necessary to this file.

M src/Core/OS/Dir_boost.cc

- #include sci_defs/boost_defs.h to determine which boost filesystem namespace to use.

1 lines of code changed in 2 files:

• include/sci_defs: boost_testdefs.h.in (+1)

dav 2014-04-15 14:19 Rev.: 51741

Updates to allow for a (almost) clean configure/build on LLNL's BGQ Vulcan machine.

M configure.ac
M configure

- Various cleanups.
- Added --with-essl so you have to explicitly ask for it (previously configure
tried to find it for you on certain machines).
- Removed stray 'echo'.
- Added test to determine if we are running on a BGQ machine.
- Don't use 'type' to find an executable, use 'which' instead.
'type' doesn't always behave the way one would expect.
- Allow for using the mpigcc compiler directly.
- Fix the specification of FORTRAN_UNDERSCORE for xlf.
- Use a .d for depend files on BGQ machines.
- If compiling on a BGQ, then use -lmass instead of -lm for the math library.
- Removed test for PNG (we don't need/use/support it anymore).
PNG was need for NRRD support at one point.
- Removed test for MPEG (Fairly sure this was only needed for SCIRun).
- Allow for --with-mpi=built-in (Ie, using mpigcc compilers)
We originally didn't like using mpiCC compilers as they never quite
worked with configure. However, it appears that a lot of work as been
done over the years making them work better. Also, at LLNL, there are
so many paths that are needed (and separate libraries) for MPI support
that it is just easier to allow the mpigcc compiler to provide them.
- Update the --with-mpi check to loop over possible libraries instead of
having to hard code every possible test in a separate SCI_TRY_LINK.
- Fix --with-petsc so that if you give it an invalid dir, it let's you know.
- Add magic PETSc compiler flags for BGQ as we are using the gcc compiler
but PETSc was compiled with xlc...

M configVars.mk.in

- Add IS_BGQ flag.
- Remove PNG and MPEG references.
- Hack: Add in PETSc flags for xlc petsc use with gcc.
- Make a few HAVE_lib/lib_INCLUDE/lib_LIBRARY sections be laid out consistently.
- Don't put @flag@ in the INCLUDES variable... make a stand-alone var for them
and use them the way all the other vars are used.
- Move the specification of the CORE_STATIC_LIBS to after the specification of
the F_LIBRARY (fortran library) as they need to reference it.

M aclocal.m4

- Renamed 'debugging' flag to 'verbose'.
- Remove RPATH from the link line when linking statically.

M Makefile.in

- Make 'cleanreally' remove all libs (lib/*.so lib/*.a lib/*.dylib) in
addition to all .o files.

M build_scripts/so_epilogue.mk

- No real changes, just indentation so it is readable...

M StandAlone/sub.mk

- Remove unwanted tabs, add whitespace to make more readable.

M StandAlone/tools/puda/sub.mk

- Add Core/Datatypes to the list of required static libs for linking.

M include/sci_defs/error_testdefs.h.in

- Added in a #if check that allows an individual file to override
the SCI_ASSERTION_LEVEL. This is required (at least for now)
because on Vulcan (BGQ), if assertions are off, then the Datatypes.cc
file causes a run time segfault (in both debug and optimized
builds). However, if assertions are turned on for this one file,
then it runs correctly. Still need to dig into what is going on...

M CCA/Components/Models/Radiation/sub.mk

- Needed INCLUDE flags should be specified for each library.

M CCA/Components/MPM/ConstitutiveModel/fortran/sub.mk

- Some of the fortran flags that are hard coded for this library
are not valid on the BGQ machine.

M CCA/Components/MPMArches/fortran/param4.h
M CCA/Components/Models/Radiation/fortran/m_param4.h
M CCA/Components/Arches/fortran/param4.h

- Remove C style comments as they don't compile using xlf on Vulcan.

M CCA/Components/MPM/ConstitutiveModel/fortran/MIGUtils.cc

- Add some magic macro hackiness to fix symbol names (dealing with
fortran underscores) instead of hard coding them.

M CCA/Components/DataArchiver/DataArchiver.cc

- Fix spacing/whitespace issues.
- Check for BGQ and if so, don't use fdatasync() as it is not implemented.

M Core/OS/Dir_boost.cc

- Newest ? boost uses boost:filesystem3, so we need to check and use the
correct namespace.

M Core/Math/sci_lapack.cc

- Add some magic macro hackiness to fix symbol names (dealing with
fortran underscores) instead of hard coding them.
- Add warning messages if lapacksvd is called but the code path is
not implemented...

M Core/Datatypes/Matrix.h
M Core/Datatypes/SearchGrid.h
M Core/Datatypes/Datatype.h
M Core/Datatypes/Color.h
M Core/Datatypes/TypeName.h
M Core/Datatypes/NrrdData.h
M Core/Datatypes/String.h
M Core/Datatypes/MatrixOperations.h
M Core/Datatypes/DenseColMajMatrix.h
M Core/Datatypes/SparseRowMatrix.h
M Core/Datatypes/PropertyManager.h
M Core/Datatypes/DenseMatrix.cc
M Core/Datatypes/Image.h
M Core/Datatypes/ColumnMatrix.h
M Core/Datatypes/DenseMatrix.h

- share.h has been removed (Windows dll thing)... Therefore remove
(now) meaningly SCISHARE.

M Core/Malloc/malloc.cc

- If DISABLE_SCI_MALLOC is not defined, then we should not be prototyping
malloc(), free(), etc.

5 lines of code changed in 2 files:

• include/sci_defs: error_testdefs.h.in (+5 -1)

ahumphrey 2014-02-26 13:15 Rev.: 51572

Finish some straggler copyright/license updates. (2013 --> 2014).
Found while working in md-dev branch.

1 lines of code changed in 2 files:

• include/sci_defs: magma_testdefs.h.in (new)

jas 2014-01-16 00:47 Rev.: 51467

Updated copyright information.

48 lines of code changed in 91 files:

• include/sci_defs: audio_testdefs.h.in (new), babel_testdefs.h.in (new), bits_testdefs.h.in (+1 -1), blas_testdefs.h.in (+1 -1), boost_testdefs.h.in (+1 -1), chromium_testdefs.h.in (new), collab_vis_testdefs.h.in (+1 -1), compile_testdefs.h.in (new), crypto_testdefs.h.in (+1 -1), cuda_testdefs.h.in (+1 -1), dataflow_testdefs.h.in (new), dynamic_cast_testdefs.h.in (+1 -1), environment_testdefs.h.in (+1 -1), error_testdefs.h.in (+1 -1), exe_testdefs.h.in (+1 -1), framework_testdefs.h.in (new), globus_testdefs.h.in (new), gperftools_testdefs.h.in (new), hashmap_testdefs.h.in (+1 -1), hdf5_testdefs.h.in (+1 -1), hypre_testdefs.h.in (+1 -1), ieeefp_testdefs.h.in (new), image_testdefs.h.in (+1 -1), kepler_testdefs.h.in (+1 -1), lapack_testdefs.h.in (new), loki_testdefs.h.in (new), malloc_testdefs.h.in (new), mdsplus_testdefs.h.in (new), mpi_testdefs.h.in (new), osx_testdefs.h.in (+1 -1), papi_testdefs.h.in (+1 -1), petsc_testdefs.h.in (+1 -1), ptolemy_testdefs.h.in (new), ruby_testdefs.h.in (+1 -1), scisock_testdefs.h.in (+1 -1), ssl_testdefs.h.in (new), stat64_testdefs.h.in (+1 -1), tao_testdefs.h.in (new), teem_testdefs.h.in (new), template_testdefs.h.in (+1 -1), tena_testdefs.h.in (+1 -1), tena_testdefs.in (+1 -1), thread_testdefs.h.in (new), uintah_testdefs.h.in (+1 -1), vdt_testdefs.h.in (+1 -1), vtk_testdefs.h.in (+1 -1), wx_testdefs.h.in (+1 -1), z_testdefs.h.in (+1 -1)