October 2008 - moab-dev - mailman3.cels.anl.gov

r2193 - MOAB/trunk/parallel
by kraftche＠mcs.anl.gov 31 Oct '08

31 Oct '08

Author: kraftche Date: 2008-10-31 17:19:38 -0500 (Fri, 31 Oct 2008) New Revision: 2193 Modified: MOAB/trunk/parallel/parallel_unit_tests.cpp Log: More fixes to existing parallel unit tests. test_ghost_elements_2_0_1 still fails because MBParallelComm creates multiple ghost copies one each processor for some quads and the test expects only one copy. Modified: MOAB/trunk/parallel/parallel_unit_tests.cpp =================================================================== --- MOAB/trunk/parallel/parallel_unit_tests.cpp 2008-10-31 22:01:06 UTC (rev 2192) +++ MOAB/trunk/parallel/parallel_unit_tests.cpp 2008-10-31 22:19:38 UTC (rev 2193) @@ -346,85 +346,25 @@ } -MBErrorCode get_ghost_entities( MBInterface& moab, - const std::vector<int> partition_geom_ids[4], - std::vector<int>& ghost_entity_ids, - int ghost_dimension, - int bridge_dimension, - int num_layers, - MBRange* ghost_handles = 0 ) +MBErrorCode get_ghost_entities( MBParallelComm& pcomm, + MBRange& ghost_ents ) { + MBRange all_ents; MBErrorCode rval; - MBTag tags[2]; - rval = moab.tag_get_handle( GEOM_DIMENSION_TAG_NAME, tags[0] ); CHKERR(rval); - rval = moab.tag_get_handle( GLOBAL_ID_TAG_NAME, tags[1] ); CHKERR(rval); - - // get first set of bridge entities - MBRange bridge_ents; - for (int dim = 0; dim < 3; ++dim) { - for (size_t i = 0; i < partition_geom_ids[dim].size(); ++i) { - const void* tag_vals[2] = { &dim, &(partition_geom_ids[dim][i]) }; - MBRange ents; - rval = moab.get_entities_by_type_and_tag( 0, MBENTITYSET, - tags, tag_vals, 2, - ents ); - CHKERR(rval); - for (MBRange::iterator j = ents.begin(); j != ents.end(); ++j) { - MBRange tmp; - rval = moab.get_entities_by_dimension( *j, bridge_dimension, tmp ); - CHKERR(rval); - bridge_ents.merge(tmp); - } - } - } - // get owned entities - MBRange owned_ents; - for (size_t i = 0; i < partition_geom_ids[3].size(); ++i) { - const int three = 3; - const void* tag_vals[2] = { &three, &partition_geom_ids[3][i] }; - MBRange ents; - rval = moab.get_entities_by_type_and_tag( 0, MBENTITYSET, - tags, tag_vals, 2, - ents ); - CHKERR(rval); - for (MBRange::iterator j = ents.begin(); j != ents.end(); ++j) { - MBRange tmp; - rval = moab.get_entities_by_dimension( *j, 3, tmp ); - CHKERR(rval); - owned_ents.merge(tmp); - } - } - // get entities of ghost dimension adjacent to owned entities - // (these cannot be ghost entities because they are either owned - // or interface entities.) - MBRange owned_and_iface; - rval = moab.get_adjacencies( owned_ents, ghost_dimension, false, owned_and_iface, MBInterface::UNION ); + rval = pcomm.get_moab()->get_entities_by_handle( 0, all_ents ); CHKERR(rval); + std::vector<unsigned char> flags(all_ents.size()); + rval = pcomm.get_moab()->tag_get_data( pcomm.pstatus_tag(), all_ents, &flags[0] ); + CHKERR(rval); - // find potential ghost entities using adjacency queries - MBRange ghost_ents; - for (int l = 0; l < num_layers; ++l) { - MBRange tmp; - rval = moab.get_adjacencies( bridge_ents, ghost_dimension, false, tmp, MBInterface::UNION ); - CHKERR(rval); - ghost_ents.merge(tmp); - bridge_ents.clear(); - rval = moab.get_adjacencies( ghost_ents, bridge_dimension, false, bridge_ents, MBInterface::UNION ); - CHKERR(rval); - } + MBRange::iterator ins = ghost_ents.begin(); + std::vector<unsigned char>::const_iterator f = flags.begin(); + for (MBRange::iterator i = all_ents.begin(); i != all_ents.end(); ++i, ++f) + if ((*f & PSTATUS_NOT_OWNED) && !(*f & PSTATUS_INTERFACE)) + ins = ghost_ents.insert( ins, *i, *i ); - // remove from ghost candidates, any entities that are - // locally owned or interface entities - ghost_ents = ghost_ents.subtract( owned_ents ); - - // get ids - ghost_entity_ids.resize( ghost_ents.size() ); - rval = moab.tag_get_data( tags[1], ghost_ents, &ghost_entity_ids[0] ); - CHKERR(rval); - if (ghost_handles) - ghost_handles->swap(ghost_ents); return MB_SUCCESS; } @@ -453,6 +393,12 @@ iface_sets.merge( ents ); } } + // get all interface entities + MBRange all_iface_ents; + for (MBRange::iterator i = iface_sets.begin(); i != iface_sets.end(); ++i) { + rval = moab.get_entities_by_handle( *i, all_iface_ents ); + CHKERR(rval); + } // for each interface set MBRange ghosts; @@ -475,7 +421,7 @@ } } - // get entities in adjacent partitions not owned by this proc. + // get entities in adjacent partitions MBRange adj_proc_ents; for (MBRange::iterator p = parents.begin(); p != parents.end(); ++p) { int id; @@ -483,10 +429,18 @@ if (std::find(partition_geom_ids[3].begin(), partition_geom_ids[3].end(), id) != partition_geom_ids[3].end()) continue; - rval = moab.get_entities_by_dimension( *p, ghost_dimension, adj_proc_ents ); + rval = moab.get_entities_by_dimension( *p, 3, adj_proc_ents ); CHKERR(rval); } + // get sub-entities implicitly within partitions + MBRange tmprange; + for (int d = 2; d >= 0; --d) { + rval = moab.get_adjacencies( adj_proc_ents, d, false, tmprange, MBInterface::UNION ); + CHKERR(rval); + } + adj_proc_ents.merge( tmprange.subtract( all_iface_ents ) ); + // get adjacent entities MBRange iface_ghosts, iface_ents; rval = moab.get_entities_by_dimension( *i, bridge_dimension, iface_ents ); CHKERR(rval); @@ -622,11 +576,11 @@ // get the global IDs of the ghosted entities MBRange ghost_ents; - std::vector<int> actual_ghost_ent_ids; - rval = get_ghost_entities( moab, partn_geom_ids, actual_ghost_ent_ids, - ghost_dimension, bridge_dimension, num_layers, - &ghost_ents ); - PCHECK(MB_SUCCESS == rval); + rval = get_ghost_entities( *pcomm, ghost_ents ); CHKERR(rval); + std::pair<MBRange::iterator,MBRange::iterator> vtx = ghost_ents.equal_range(MBVERTEX); + ghost_ents.erase( vtx.first, vtx.second ); + std::vector<int> actual_ghost_ent_ids(ghost_ents.size()); + rval = moab.tag_get_data( id_tag, ghost_ents, &actual_ghost_ent_ids[0] ); CHKERR(rval); // read file in serial MBCore moab2;

1 0

r2192 - MOAB/trunk
by kraftche＠mcs.anl.gov 31 Oct '08

31 Oct '08

Author: kraftche Date: 2008-10-31 17:01:06 -0500 (Fri, 31 Oct 2008) New Revision: 2192 Modified: MOAB/trunk/MBTest.cpp Log: remove some unused code from previous checkin Modified: MOAB/trunk/MBTest.cpp =================================================================== --- MOAB/trunk/MBTest.cpp 2008-10-31 21:35:34 UTC (rev 2191) +++ MOAB/trunk/MBTest.cpp 2008-10-31 22:01:06 UTC (rev 2192) @@ -1907,21 +1907,6 @@ return mb_mesh_sets_test( mb, MESHSET_ORDERED ); } -// Split an MBRange into three non-intersecting -// strict subsets. Return two and discard one. -void split_3( const MBRange& all_ents, - MBRange& group1, - MBRange& group2 ) -{ - group1.clear(); - group2.clear(); - size_t size = all_ents.size(); - MBRange::iterator i2 = all_ents.begin(); i2 += size/3; - MBRange::iterator i3 = i2; i3 += size/3; - group1.merge( all_ents.begin(), i2 ); - group2.merge( i3, all_ents.end() ); -} - // Verify that all query functions *append* to output MBRange MBErrorCode mb_mesh_set_appends( MBInterface* mb, int flags ) {

1 0

r2191 - MOAB/trunk
by kraftche＠mcs.anl.gov 31 Oct '08

31 Oct '08

Author: kraftche Date: 2008-10-31 16:35:34 -0500 (Fri, 31 Oct 2008) New Revision: 2191 Modified: MOAB/trunk/MBMeshSet.hpp MOAB/trunk/MBTest.cpp Log: o Add unit tests to verify that all get_entities_by_* functions in MBInterface *append* to the output range (unless MBInterface::INTERSECT). o Fix one inconsistant case: get_entities_by_handle for a range-based set overwrote any initial contents of the output range. Modified: MOAB/trunk/MBMeshSet.hpp =================================================================== --- MOAB/trunk/MBMeshSet.hpp 2008-10-31 17:28:54 UTC (rev 2190) +++ MOAB/trunk/MBMeshSet.hpp 2008-10-31 21:35:34 UTC (rev 2191) @@ -449,7 +449,6 @@ } else { assert(count%2 == 0); - entities.clear(); MBRange::iterator in = entities.begin(); for (size_t i = 0; i < count; i += 2) in = entities.insert( in, ptr[i], ptr[i+1] ); Modified: MOAB/trunk/MBTest.cpp =================================================================== --- MOAB/trunk/MBTest.cpp 2008-10-31 17:28:54 UTC (rev 2190) +++ MOAB/trunk/MBTest.cpp 2008-10-31 21:35:34 UTC (rev 2191) @@ -1907,7 +1907,152 @@ return mb_mesh_sets_test( mb, MESHSET_ORDERED ); } +// Split an MBRange into three non-intersecting +// strict subsets. Return two and discard one. +void split_3( const MBRange& all_ents, + MBRange& group1, + MBRange& group2 ) +{ + group1.clear(); + group2.clear(); + size_t size = all_ents.size(); + MBRange::iterator i2 = all_ents.begin(); i2 += size/3; + MBRange::iterator i3 = i2; i3 += size/3; + group1.merge( all_ents.begin(), i2 ); + group2.merge( i3, all_ents.end() ); +} +// Verify that all query functions *append* to output MBRange +MBErrorCode mb_mesh_set_appends( MBInterface* mb, int flags ) +{ + MBErrorCode rval; + + // get all handles and subdivide into vertex and non-vertex ents + MBRange all_ents, verts, elems, results; + rval = mb->get_entities_by_handle( 0, all_ents ); + if (MB_SUCCESS != rval) + return rval; + MBRange::iterator ve = all_ents.upper_bound( MBVERTEX ); + verts.merge( all_ents.begin(), ve ); + elems.merge( ve, all_ents.end() ); + + // If we're not testing queries from the root set, + // create a set containing all the vertices + MBEntityHandle set = 0; + if (flags != -1) { + rval = mb->create_meshset( flags, set ); + if (MB_SUCCESS != rval) + return rval; + rval = mb->add_entities( set, verts ); + if (MB_SUCCESS != rval) + return rval; + } + + // Test get_entities_by_handle. This one doesn't make + // much sense if we're testing the root set, but it doesn't + // hurt to test it anyway. + results = elems; + rval = mb->get_entities_by_handle( set, results ); + if (MB_SUCCESS != rval) + return rval; + if (results != all_ents) + return MB_FAILURE; + + // Test get_entities_by_dimension + results = elems; + rval = mb->get_entities_by_dimension( set, 0, results ); + if (MB_SUCCESS != rval) + return rval; + if (results != all_ents) + return MB_FAILURE; + + // Test get_entities_by_type + results = elems; + rval = mb->get_entities_by_type( set, MBVERTEX, results ); + if (MB_SUCCESS != rval) + return rval; + if (results != all_ents) + return MB_FAILURE; + + // choose a single entity for testing tag queries + MBEntityHandle entity = verts.front(); + MBRange expected( elems ); + expected.insert( entity ); + + MBTag sparse, dense; + const int zero = 0, one = 1; + const void* vals[] = {&one}; + + // Test get_entities_by_type_and_tag w/ sparse tag and no value + rval = mb->tag_create( "mb_mesh_set_appends_sparse", + sizeof(int), + MB_TAG_SPARSE, + MB_TYPE_INTEGER, + sparse, 0 ); + if (MB_SUCCESS != rval) + return rval; + rval = mb->tag_set_data( sparse, &entity, 1, &one ); + if (MB_SUCCESS != rval) + return rval; + results = elems; + rval = mb->get_entities_by_type_and_tag( set, + TYPE_FROM_HANDLE(entity), + &sparse, 0, 1, + results, MBInterface::UNION ); + if (MB_SUCCESS != rval) + return rval; + if (results != expected) + return MB_FAILURE; + // Test again, but specify tag value + results = elems; + rval = mb->get_entities_by_type_and_tag( set, + TYPE_FROM_HANDLE(entity), + &sparse, vals, 1, + results, MBInterface::UNION ); + if (MB_SUCCESS != rval) + return rval; + if (results != expected) + return MB_FAILURE; + + // Test get_entities_by_type_and_tag w/ dense tag + rval = mb->tag_create( "mb_mesh_set_appends_dense", + sizeof(int), + MB_TAG_DENSE, + MB_TYPE_INTEGER, + dense, &zero ); + if (MB_SUCCESS != rval) + return rval; + rval = mb->tag_set_data( dense, &entity, 1, &one ); + if (MB_SUCCESS != rval) + return rval; + results = elems; + rval = mb->get_entities_by_type_and_tag( set, + TYPE_FROM_HANDLE(entity), + &dense, vals, 1, + results, MBInterface::UNION ); + if (MB_SUCCESS != rval) + return rval; + if (results != expected) + return MB_FAILURE; + + return MB_SUCCESS; +} + +MBErrorCode mb_mesh_set_set_appends( MBInterface* mb ) +{ + return mb_mesh_set_appends( mb, MESHSET_SET ); +} + +MBErrorCode mb_mesh_set_list_appends( MBInterface* mb ) +{ + return mb_mesh_set_appends( mb, MESHSET_ORDERED ); +} + +MBErrorCode mb_mesh_set_root_appends( MBInterface* mb ) +{ + return mb_mesh_set_appends( mb, -1 ); +} + // number of entities of type MBVERTEX, MBEDGE, MBDTri, MBQUAD, MBTET, and MBHEX // in mbtest1.g (all other values are 0. static const unsigned int num_entities[MBMAXTYPE] = {47,12,18,8,22,8}; @@ -5671,6 +5816,9 @@ RUN_TEST( mb_mesh_sets_set_test ); RUN_TEST( mb_mesh_sets_list_test ); RUN_TEST( mb_mesh_set_parent_child_test ); + RUN_TEST( mb_mesh_set_set_appends ); + RUN_TEST( mb_mesh_set_list_appends ); + RUN_TEST( mb_mesh_set_root_appends ); RUN_TEST( mb_tags_test ); RUN_TEST( mb_dense_tag_test ); RUN_TEST( mb_sparse_tag_test );

1 0

r2190 - MOAB/trunk/parallel
by kraftche＠mcs.anl.gov 31 Oct '08

31 Oct '08

Author: kraftche Date: 2008-10-31 12:28:54 -0500 (Fri, 31 Oct 2008) New Revision: 2190 Modified: MOAB/trunk/parallel/parallel_unit_tests.cpp Log: fix tests: for ghosting more than one layer of elements, the behavior expected by the tests was not the desired behavior Modified: MOAB/trunk/parallel/parallel_unit_tests.cpp =================================================================== --- MOAB/trunk/parallel/parallel_unit_tests.cpp 2008-10-31 17:27:13 UTC (rev 2189) +++ MOAB/trunk/parallel/parallel_unit_tests.cpp 2008-10-31 17:28:54 UTC (rev 2190) @@ -428,6 +428,86 @@ return MB_SUCCESS; } +MBErrorCode get_expected_ghosts( MBInterface& moab, + const std::vector<int> partition_geom_ids[4], + std::vector<int>& ghost_entity_ids, + int ghost_dimension, + int bridge_dimension, + int num_layers ) +{ + MBErrorCode rval; + MBTag tags[2]; + rval = moab.tag_get_handle( GEOM_DIMENSION_TAG_NAME, tags[0] ); CHKERR(rval); + rval = moab.tag_get_handle( GLOBAL_ID_TAG_NAME, tags[1] ); CHKERR(rval); + + // get all interface sets + MBRange iface_sets; + for (int d = 0; d < 3; ++d) { + for (size_t i = 0; i < partition_geom_ids[d].size(); ++i) { + // get the entity set + const void* tag_vals[2] = { &d, &(partition_geom_ids[d][i]) }; + MBRange ents; + rval = moab.get_entities_by_type_and_tag( 0, MBENTITYSET, + tags, tag_vals, 2, + ents ); CHKERR(rval); + iface_sets.merge( ents ); + } + } + + // for each interface set + MBRange ghosts; + for (MBRange::iterator i = iface_sets.begin(); i != iface_sets.end(); ++i) { + if (num_layers < 1) + break; + + // get iface dim + int gdim = -1; + rval = moab.tag_get_data( tags[0], &*i, 1, &gdim ); + CHKERR(rval); + + // get partitions adjacent to interface set + MBRange parents; parents.insert(*i); + for (int step = gdim; step < 3; ++step) { + MBRange old_parents; + old_parents.swap(parents); + for (MBRange::iterator p = old_parents.begin(); p != old_parents.end(); ++p) { + rval = moab.get_parent_meshsets( *p, parents ); CHKERR(rval); + } + } + + // get entities in adjacent partitions not owned by this proc. + MBRange adj_proc_ents; + for (MBRange::iterator p = parents.begin(); p != parents.end(); ++p) { + int id; + rval = moab.tag_get_data( tags[1], &*p, 1, &id ); CHKERR(rval); + if (std::find(partition_geom_ids[3].begin(), partition_geom_ids[3].end(), id) + != partition_geom_ids[3].end()) + continue; + rval = moab.get_entities_by_dimension( *p, ghost_dimension, adj_proc_ents ); + CHKERR(rval); + } + + // get adjacent entities + MBRange iface_ghosts, iface_ents; + rval = moab.get_entities_by_dimension( *i, bridge_dimension, iface_ents ); CHKERR(rval); + for (int n = 0; n < num_layers; ++n) { + iface_ghosts.clear(); + rval = moab.get_adjacencies( iface_ents, ghost_dimension, false, iface_ghosts, MBInterface::UNION ); CHKERR(rval); + iface_ents.clear(); + rval = moab.get_adjacencies( iface_ghosts, bridge_dimension, false, iface_ents, MBInterface::UNION ); CHKERR(rval); + } + + // intersect with entities in adjacent partitions + ghosts.merge( iface_ghosts.intersect( adj_proc_ents ) ); + } + + // get ids + ghost_entity_ids.resize( ghosts.size() ); + rval = moab.tag_get_data( tags[1], ghosts, &ghost_entity_ids[0] ); + CHKERR(rval); + return MB_SUCCESS; +} + MBErrorCode test_ghost_elements( const char* filename, int ghost_dimension, int bridge_dimension, @@ -556,7 +636,7 @@ // get the global IDs of teh entities we expect to be ghosted std::vector<int> expected_ghost_ent_ids; - rval = get_ghost_entities( moab2, partn_geom_ids, expected_ghost_ent_ids, + rval = get_expected_ghosts( moab2, partn_geom_ids, expected_ghost_ent_ids, ghost_dimension, bridge_dimension, num_layers ); PCHECK(MB_SUCCESS == rval);

1 0

r2189 - MOAB/trunk/parallel
by kraftche＠mcs.anl.gov 31 Oct '08

31 Oct '08

Author: kraftche Date: 2008-10-31 12:27:13 -0500 (Fri, 31 Oct 2008) New Revision: 2189 Modified: MOAB/trunk/parallel/MBParallelComm.hpp Log: add utility method to get moab instance from MBParallelComm Modified: MOAB/trunk/parallel/MBParallelComm.hpp =================================================================== --- MOAB/trunk/parallel/MBParallelComm.hpp 2008-10-31 17:26:40 UTC (rev 2188) +++ MOAB/trunk/parallel/MBParallelComm.hpp 2008-10-31 17:27:13 UTC (rev 2189) @@ -617,6 +617,8 @@ int to_proc, const MBRange &new_ents); + MBInterface* get_moab() const { return mbImpl; } + private: //! goes through from_vec, and for any with type MBMAXTYPE, replaces with //! new_ents value at index corresponding to id of entity in from_vec

1 0

r2188 - MOAB/trunk/parallel
by kraftche＠mcs.anl.gov 31 Oct '08

31 Oct '08

Author: kraftche Date: 2008-10-31 12:26:40 -0500 (Fri, 31 Oct 2008) New Revision: 2188 Modified: MOAB/trunk/parallel/MBParallelComm.cpp Log: Remove invalid assert: It is possible to receive an empty buffer when exchanging ghost entities because the exchange is done for all interface sets, regardless of whether or not the interface set contains any entities of the specified bridge dimension. (E.g. consider an interface set for two processors that only share edges and a bridge dimension of 2.) Modified: MOAB/trunk/parallel/MBParallelComm.cpp =================================================================== --- MOAB/trunk/parallel/MBParallelComm.cpp 2008-10-30 23:47:26 UTC (rev 2187) +++ MOAB/trunk/parallel/MBParallelComm.cpp 2008-10-31 17:26:40 UTC (rev 2188) @@ -3346,7 +3346,7 @@ buff_ptr = &ownerRBuffs[ind][0]; assert(ind >= MAX_SHARING_PROCS); UNPACK_RANGE(buff_ptr, remote_handles_r); - assert(!sent_ents[ind-MAX_SHARING_PROCS].empty()); + //assert(!sent_ents[ind-MAX_SHARING_PROCS].empty()); result = set_remote_data(sent_ents[ind-MAX_SHARING_PROCS], remote_handles_r, buffProcs[ind-MAX_SHARING_PROCS]); RRA("Trouble setting remote data range on sent entities in ghost exchange.");

1 0

r2173 - MOAB/trunk/parallel
by tautges＠mcs.anl.gov 23 Oct '08

23 Oct '08

Author: tautges Date: 2008-10-23 10:42:41 -0500 (Thu, 23 Oct 2008) New Revision: 2173 Modified: MOAB/trunk/parallel/MBParallelComm.cpp MOAB/trunk/parallel/Makefile.am MOAB/trunk/parallel/pcomm_unit.cpp Log: Adding arguments to some get_connectivity calls so they work with structured meshes. Changing some array declarations to work with --pedantic. Modified: MOAB/trunk/parallel/MBParallelComm.cpp =================================================================== --- MOAB/trunk/parallel/MBParallelComm.cpp 2008-10-22 19:11:10 UTC (rev 2172) +++ MOAB/trunk/parallel/MBParallelComm.cpp 2008-10-23 15:42:41 UTC (rev 2173) @@ -992,6 +992,7 @@ allr_it++; std::vector<int>::iterator nv_it = verts_per_entity.begin(); std::vector<MBEntityType>::iterator et_it = ent_types.begin(); + std::vector<MBEntityHandle> dum_connect; nv_it++; et_it++; for (; allr_it != all_ranges.end(); allr_it++, nv_it++, et_it++) { @@ -1009,7 +1010,8 @@ int num_connect; MBEntityHandle *start_vec = (MBEntityHandle*)buff_ptr; for (MBRange::const_iterator rit = allr_it->begin(); rit != allr_it->end(); rit++) { - result = mbImpl->get_connectivity(*rit, connect, num_connect); + result = mbImpl->get_connectivity(*rit, connect, num_connect, true, + &dum_connect); RRA("Failed to get connectivity."); assert(num_connect == *nv_it); PACK_EH(buff_ptr, &connect[0], num_connect); @@ -2765,6 +2767,7 @@ std::vector<int> sharing_procs, sharing_procs1, sharing_procs2; std::vector<int>::iterator vii; std::vector<unsigned char> pstatus_flags; + std::vector<MBEntityHandle> dum_connect; for (int d = 3; d > 0; d--) { if (resolve_dim == d) continue; @@ -2772,7 +2775,8 @@ for (MBRange::iterator rit = skin_ents[d].begin(); rit != skin_ents[d].end(); rit++) { // get connectivity - result = mbImpl->get_connectivity(*rit, connect, num_connect); + result = mbImpl->get_connectivity(*rit, connect, num_connect, true, + &dum_connect); RRA("Failed to get connectivity on non-vertex skin entities."); // if any vertices not shared, this entity isn't Modified: MOAB/trunk/parallel/Makefile.am =================================================================== Modified: MOAB/trunk/parallel/pcomm_unit.cpp =================================================================== --- MOAB/trunk/parallel/pcomm_unit.cpp 2008-10-22 19:11:10 UTC (rev 2172) +++ MOAB/trunk/parallel/pcomm_unit.cpp 2008-10-23 15:42:41 UTC (rev 2173) @@ -168,7 +168,7 @@ void create_simple_grid( MBInterface& moab, unsigned x, unsigned y, unsigned z ) { MBErrorCode rval; - MBEntityHandle verts[x*y*z]; + MBEntityHandle *verts = new MBEntityHandle[x*y*z]; for (unsigned k = 0; k < z; ++k) for (unsigned j = 0; j < y; ++j) for (unsigned i = 0; i < x; ++i) { @@ -177,7 +177,7 @@ CHECK_ERR(rval); } - MBEntityHandle elems[(x-1)*(y-1)*(z-1)]; + MBEntityHandle *elems = new MBEntityHandle[(x-1)*(y-1)*(z-1)]; for (unsigned k = 0; k < (z-1); ++k) for (unsigned j = 0; j < (y-1); ++j) for (unsigned i = 0; i < (x-1); ++i) { @@ -193,6 +193,8 @@ rval = moab.create_element( MBHEX, conn, 8, elems[(x-1)*(y-1)*k + (x-1)*j + i] ); CHECK_ERR(rval); } + delete [] verts; + delete [] elems; }

1 0

r2170 - in MOAB/trunk: . tools/iMesh
by kraftche＠mcs.anl.gov 21 Oct '08

21 Oct '08

Author: kraftche Date: 2008-10-21 13:30:01 -0500 (Tue, 21 Oct 2008) New Revision: 2170 Modified: MOAB/trunk/configure.in MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp Log: clean up handle-casting templates Modified: MOAB/trunk/configure.in =================================================================== --- MOAB/trunk/configure.in 2008-10-21 18:29:06 UTC (rev 2169) +++ MOAB/trunk/configure.in 2008-10-21 18:30:01 UTC (rev 2170) @@ -25,7 +25,8 @@ AM_CONDITIONAL([HAVE_ZCAT],[test "x" = "x$ZCAT"]) SNL_TEMPLATE_SPECIALIZATION -DEFINES="$DEFINES $TEMPLATE_SPECIALIZATION" +SNL_TEMPLATE_FUNC_SPECIALIZATION +DEFINES="$DEFINES $TEMPLATE_SPECIALIZATION $TEMPLATE_FUNC_SPECIALIZATION" if test "x" != "x$FC"; then AC_FC_WRAPPERS Modified: MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp =================================================================== --- MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp 2008-10-21 18:29:06 UTC (rev 2169) +++ MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp 2008-10-21 18:30:01 UTC (rev 2170) @@ -50,19 +50,19 @@ /******** Type-safe casting between MOAB and ITAPS types *********/ -#ifndef NO_SPEICALIZED_TEMPLATE_FUNCTIONS +#ifndef TEMPLATE_FUNC_SPECIALIZATION // if no template specializtion, disable some type checking -template <typename T> inline -T itaps_cast( MBEntityHandle handle ) +template <typename T, typename S> inline +T itaps_cast( S handle ) { - assert(sizeof(handle) >= sizeof(T)); + assert(sizeof(S) >= sizeof(T)); return reinterpret_cast<T>(handle); } #else // basic template method : only works to cast to equivalent types (no-op) -template <typename T> inline -T itaps_cast( MBEntityHandle ) +template <typename T, typename S> inline +T itaps_cast( S h ) { return h; } // verify size and do reinterpret cast template <typename T> inline T itaps_cast_internal_( MBEntityHandle h ) @@ -70,27 +70,76 @@ assert(sizeof(T) >= sizeof(MBEntityHandle)); return reinterpret_cast<T>(h); } +// verify size and do reinterpret cast +template <typename T> inline MBEntityHandle* itaps_cast_ptr_( T* h ) +{ + assert(sizeof(T) == sizeof(MBEntityHandle)); + return reinterpret_cast<MBEntityHandle*>(h); +} +// verify size and do reinterpret cast +template <typename T> inline const MBEntityHandle* itaps_cast_const_ptr_( const T* h ) +{ + assert(sizeof(T) == sizeof(MBEntityHandle)); + return reinterpret_cast<const MBEntityHandle*>(h); +} // verify set-type handle before cast template <typename T> inline T itaps_set_cast_( MBEntityHandle h ) { assert(TYPE_FROM_HANDLE(h) == MBENTITYSET); return itaps_cast_internal_<T>(h); } -// Specializations if generic template for ITAPS types that -// an MBEntityHandle can be legitimately cast to. -template <> inline -iMeshP_PartitionHandle itaps_cast<iMeshP_PartitionHandle>( MBEntityHandle h ) - { return itaps_set_cast_<iMeshP_PartitionHandle>(h); } -template <> inline -iMeshP_PartHandle itaps_cast<iMeshP_PartHandle>( MBEntityHandle h ) - { return itaps_set_cast_<iMeshP_PartHandle>(h); } -template <> inline -iBase_EntitySetHandle itaps_cast<iBase_EntitySetHandle>( MBEntityHandle h ) - { return itaps_set_cast_<iBase_EntitySetHandle>(h); } -template <> inline -iBase_EntityHandle itaps_cast<iBase_EntityHandle>( MBEntityHandle h ) - { return itaps_cast_internal_<iBase_EntityHandle>(h); } +// define conversion routines between itaps handle and MBEntityHandle types +#define DECLARE_ALLOWED_ITAPS_CONVERSION( ITAPS_HANDLE_TYPE ) \ + template <> inline \ + ITAPS_HANDLE_TYPE \ + itaps_cast<ITAPS_HANDLE_TYPE,MBEntityHandle>( MBEntityHandle h ) \ + { return itaps_cast_internal_<ITAPS_HANDLE_TYPE>(h); } \ + \ + template <> inline \ + MBEntityHandle \ + itaps_cast<MBEntityHandle,ITAPS_HANDLE_TYPE>( ITAPS_HANDLE_TYPE handle ) \ + { return reinterpret_cast<MBEntityHandle>(handle); } \ + \ + template <> inline \ + MBEntityHandle* \ + itaps_cast<MBEntityHandle*,ITAPS_HANDLE_TYPE*>( ITAPS_HANDLE_TYPE* ptr ) \ + { return itaps_cast_ptr_(ptr); } \ + \ + template <> inline \ + const MBEntityHandle* \ + itaps_cast<const MBEntityHandle*,const ITAPS_HANDLE_TYPE*>( const ITAPS_HANDLE_TYPE* ptr ) \ + { return itaps_cast_const_ptr_(ptr); } + + +// define conversion routines between itaps handle and MBEntityHandle types +// but limit to MBEntityHandle for MBENTITYSET type. +#define DECLARE_ALLOWED_ITAPS_SET_CONVERSION( ITAPS_HANDLE_TYPE ) \ + template <> inline \ + ITAPS_HANDLE_TYPE \ + itaps_cast<ITAPS_HANDLE_TYPE,MBEntityHandle>( MBEntityHandle h ) \ + { return itaps_set_cast_<ITAPS_HANDLE_TYPE>(h); } \ + \ + template <> inline \ + MBEntityHandle \ + itaps_cast<MBEntityHandle,ITAPS_HANDLE_TYPE>( ITAPS_HANDLE_TYPE handle ) \ + { return reinterpret_cast<MBEntityHandle>(handle); } \ + \ + template <> inline \ + MBEntityHandle* \ + itaps_cast<MBEntityHandle*,ITAPS_HANDLE_TYPE*>( ITAPS_HANDLE_TYPE* ptr ) \ + { return itaps_cast_ptr_(ptr); } \ + \ + template <> inline \ + const MBEntityHandle* \ + itaps_cast<const MBEntityHandle*,const ITAPS_HANDLE_TYPE*>( const ITAPS_HANDLE_TYPE* ptr ) \ + { return itaps_cast_const_ptr_(ptr); } + +DECLARE_ALLOWED_ITAPS_SET_CONVERSION( iMeshP_PartitionHandle ) +DECLARE_ALLOWED_ITAPS_SET_CONVERSION( iMeshP_PartHandle ) +//DECLARE_ALLOWED_ITAPS_SET_CONVERSION( iBase_EntitySetHandle ) +DECLARE_ALLOWED_ITAPS_SET_CONVERSION( iBase_EntityHandle ) + #endif // Need a different function name for MBTag because (currently) @@ -101,38 +150,6 @@ return reinterpret_cast<iBase_TagHandle>(t); } -// No template needed when casting from ITAPS types because -// only one valid type to cast to (MBEntityHandle). -MBEntityHandle itaps_cast( iMeshP_PartitionHandle handle ) - { return reinterpret_cast<MBEntityHandle>(handle); } -MBEntityHandle itaps_cast( iMeshP_PartHandle handle ) - { return reinterpret_cast<MBEntityHandle>(handle); } -//MBEntityHandle itaps_cast( iBase_EntitySetHandle handle ) -// { return reinterpret_cast<MBEntityHandle>(handle); } -MBEntityHandle itaps_cast( iBase_EntityHandle handle ) - { return reinterpret_cast<MBEntityHandle>(handle); } - -// Cast arrays of ITAPS types to array of MBEntityHandle -MBEntityHandle* itaps_cast( iMeshP_PartitionHandle* ptr ) - { return reinterpret_cast<MBEntityHandle*>(ptr); } -MBEntityHandle* itaps_cast( iMeshP_PartHandle* ptr ) - { return reinterpret_cast<MBEntityHandle*>(ptr); } -//MBEntityHandle* itaps_cast( iBase_EntitySetHandle* ptr ) -// { return reinterpret_cast<MBEntityHandle*>(ptr); } -MBEntityHandle* itaps_cast( iBase_EntityHandle* ptr ) - { return reinterpret_cast<MBEntityHandle*>(ptr); } - -// Cast const arrays of ITAPS types to array of MBEntityHandle -const MBEntityHandle* itaps_cast( const iMeshP_PartitionHandle* ptr ) - { return reinterpret_cast<const MBEntityHandle*>(ptr); } -const MBEntityHandle* itaps_cast( const iMeshP_PartHandle* ptr ) - { return reinterpret_cast<const MBEntityHandle*>(ptr); } -//const MBEntityHandle* itaps_cast( const iBase_EntitySetHandle* ptr ) -// { return reinterpret_cast<const MBEntityHandle*>(ptr); } -const MBEntityHandle* itaps_cast( const iBase_EntityHandle* ptr ) - { return reinterpret_cast<const MBEntityHandle*>(ptr); } - - /********************* ITAPS arrays **************************/ // Access this method using ALLOCATE_ARRAY macro, rather than callind directly. @@ -169,7 +186,7 @@ // Handle returning MBRange in ITAPS array (do ALLOCATE_ARRAY and copy). #define MBRANGE_TO_ITAPS_ARRAY( RANGE, NAME ) do { \ ALLOCATE_ARRAY( NAME, (RANGE).size() ); \ - std::copy( (RANGE).begin(), (RANGE).end(), itaps_cast(*(NAME)) ); \ + std::copy( (RANGE).begin(), (RANGE).end(), itaps_cast<MBEntityHandle*>(*(NAME)) ); \ } while (false) @@ -211,7 +228,7 @@ iMeshP_PartitionHandle partition_handle, int *err) { - MBEntityHandle handle = itaps_cast(partition_handle); + MBEntityHandle handle = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, handle ); if (pcomm) delete pcomm; @@ -224,7 +241,7 @@ MPI_Comm* communicator_out, int* err ) { - MBEntityHandle handle = itaps_cast(partition_handle); + MBEntityHandle handle = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, handle ); if (pcomm) RETURN (iBase_FAILURE); @@ -291,7 +308,7 @@ int *num_local_part, int *err) { - MBEntityHandle prtn = itaps_cast(partition_handle); + MBEntityHandle prtn = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, prtn ); if (!pcomm) RETURN (iBase_FAILURE); @@ -312,7 +329,7 @@ int *part_handles_size, int *err ) { - MBEntityHandle prtn = itaps_cast(partition_handle); + MBEntityHandle prtn = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, prtn ); if (!pcomm) RETURN (iBase_FAILURE); @@ -347,7 +364,7 @@ { FIXME; // need to handle handles to "remote parts" ? - MBEntityHandle prtn = itaps_cast(partition_handle); + MBEntityHandle prtn = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, prtn ); if (!pcomm) RETURN (iBase_FAILURE); @@ -366,7 +383,7 @@ { FIXME; // need to prune out entities that are remote - MBEntityHandle prtn = itaps_cast(partition_handle); + MBEntityHandle prtn = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, prtn ); if (!pcomm) RETURN (iBase_FAILURE); @@ -391,7 +408,7 @@ { FIXME; // need to prune out entities that are remote - MBEntityHandle prtn = itaps_cast(partition_handle); + MBEntityHandle prtn = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, prtn ); if (!pcomm) RETURN (iBase_FAILURE); @@ -412,7 +429,7 @@ iMeshP_PartHandle *part_handle, int *err ) { - MBEntityHandle h, p = itaps_cast(partition_handle); + MBEntityHandle h, p = itaps_cast<MBEntityHandle>(partition_handle); MBErrorCode rval; MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, p ); if (!pcomm) @@ -453,8 +470,8 @@ int *err ) { MBErrorCode rval; - MBEntityHandle h = itaps_cast(part_handle), - p = itaps_cast(partition_handle); + MBEntityHandle h = itaps_cast<MBEntityHandle>(part_handle), + p = itaps_cast<MBEntityHandle>(partition_handle); rval = MBI->remove_entities( p, &h, 1 ); CHKERR(rval); @@ -487,7 +504,7 @@ int *part_ids_size, int *err ) { - MBEntityHandle p = itaps_cast(partition_handle); + MBEntityHandle p = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, p ); if (!pcomm) RETURN (iBase_FAILURE); @@ -507,7 +524,7 @@ } MBErrorCode rval = MBI->tag_get_data( tag, - itaps_cast(part_handles), + itaps_cast<const MBEntityHandle*>(part_handles), part_handles_size, array ); CHKERR(rval); @@ -639,8 +656,8 @@ { MBErrorCode rval; MBRange r1, r2; - MBEntityHandle h1 = itaps_cast(set1); - MBEntityHandle h2 = itaps_cast(set2); + MBEntityHandle h1 = itaps_cast<MBEntityHandle>(set1); + MBEntityHandle h2 = itaps_cast<MBEntityHandle>(set2); if (topo != iMesh_ALL_TOPOLOGIES) { if ((unsigned)topo > sizeof(mb_topology_table)/sizeof(mb_topology_table[0])) @@ -937,19 +954,19 @@ int* is_owner_size, int *err ) { - MBEntityHandle p = itaps_cast(partition_handle); + MBEntityHandle p = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, p ); if (!pcomm) RETURN (iBase_FAILURE); - const MBEntityHandle* handles = itaps_cast(entity_handles); + const MBEntityHandle* handles = itaps_cast<const MBEntityHandle*>(entity_handles); std::vector<unsigned char> pstatus(entity_handles_size); MBErrorCode result = MBI->tag_get_data( pcomm->pstatus_tag(), handles, entity_handles_size, &pstatus[0] ); CHKERR(result); - MBEntityHandle part = itaps_cast(part_handle); + MBEntityHandle part = itaps_cast<MBEntityHandle>(part_handle); MBRange part_ents; result = MBI->get_entities_by_handle( part, part_ents ); CHKERR(result); @@ -991,14 +1008,14 @@ /*inout*/ int* par_status_size, int *err) { - MBEntityHandle p = itaps_cast(partition_handle); + MBEntityHandle p = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, p ); if (!pcomm) RETURN (iBase_FAILURE); std::vector<unsigned char> pstatus(entity_handles_size); MBErrorCode result = MBI->tag_get_data(pcomm->pstatus_tag(), - itaps_cast(entity_handles), + itaps_cast<const MBEntityHandle*>(entity_handles), entity_handles_size, &pstatus[0]); CHKERR(result); @@ -1021,14 +1038,14 @@ int *num_copies_ent, int *err ) { - MBEntityHandle p = itaps_cast(partition_handle); + MBEntityHandle p = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm* pcomm = MBParallelComm::get_pcomm( MBI, p ); if (!pcomm) RETURN (iBase_FAILURE); int shared_proc; MBErrorCode result = MBI->tag_get_data(pcomm->sharedp_tag(), - itaps_cast(&entity_handle), 1, + itaps_cast<const MBEntityHandle*>(&entity_handle), 1, &shared_proc); CHKERR(result); if (-1 != shared_proc) { @@ -1039,7 +1056,7 @@ const void* data_ptr = 0; int data_size = 0; result = MBI->tag_get_data( pcomm->sharedps_tag(), - itaps_cast(&entity_handle), + itaps_cast<const MBEntityHandle*>(&entity_handle), 1, &data_ptr, &data_size ); CHKERR(result); @@ -1074,7 +1091,7 @@ MBParallelComm pc(MBI); MBEntityHandle shared_handle; MBErrorCode result = MBI->tag_get_data(pc.sharedh_tag(), - itaps_cast(&entity_handle), 1, + itaps_cast<const MBEntityHandle*>(&entity_handle), 1, &shared_handle); if (MB_SUCCESS != result) { RETURN(iBase_ERROR_MAP[result]); @@ -1099,7 +1116,7 @@ static std::vector<MBEntityHandle> shared_handles(tag_size); result = MBI->tag_get_data(pc.sharedhs_tag(), - itaps_cast(&entity_handle), 1, + itaps_cast<const MBEntityHandle*>(&entity_handle), 1, &shared_handles[0]); if (MB_SUCCESS != result) { RETURN(iBase_ERROR_MAP[result]); @@ -1110,7 +1127,7 @@ part_handles.resize(index+1, 0); ALLOCATE_ARRAY( copies_entity_handles, index+1 ); std::copy(&shared_handles[0], &shared_handles[index], - itaps_cast(*copies_entity_handles)); + itaps_cast<MBEntityHandle*>(*copies_entity_handles)); } ALLOCATE_ARRAY(part_ids, part_handles.size()); @@ -1338,7 +1355,7 @@ /*out*/ int *part_handles_size, int *err) { - MBEntityHandle p = itaps_cast(partition_handle); + MBEntityHandle p = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm *pc = MBParallelComm::get_pcomm(MBI, p); if (!pc) RETURN(iBase_ERROR_MAP[MB_FAILURE]); @@ -1363,7 +1380,7 @@ /*out*/ int *part_handles_size, int *err) { - MBEntityHandle p = itaps_cast(partition_handle); + MBEntityHandle p = itaps_cast<MBEntityHandle>(partition_handle); MBParallelComm *pc = MBParallelComm::get_pcomm(MBI, p); if (!pc) RETURN(iBase_ERROR_MAP[MB_FAILURE]);

1 0

r2168 - MOAB/trunk/m4
by kraftche＠mcs.anl.gov 21 Oct '08

21 Oct '08

Author: kraftche Date: 2008-10-21 13:28:25 -0500 (Tue, 21 Oct 2008) New Revision: 2168 Modified: MOAB/trunk/m4/cplusplus.m4 Log: o Add test for support of template function specialiation. o Clean up some other tests in same file Modified: MOAB/trunk/m4/cplusplus.m4 =================================================================== --- MOAB/trunk/m4/cplusplus.m4 2008-10-21 17:28:30 UTC (rev 2167) +++ MOAB/trunk/m4/cplusplus.m4 2008-10-21 18:28:25 UTC (rev 2168) @@ -11,32 +11,46 @@ # For example: if this is defined, #include <iostrea.h> rather than <iostream> ####################################################################################### AC_DEFUN([SNL_CANT_USE_STD], [ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_MSG_CHECKING([for C++-standard header files]) -AC_TRY_COMPILE([#include <vector> - #include <string> - #include <map> - #include <algorithm> - ], - [std::vector<std::string> v; - std::map<std::string,std::string> m; - ], - [AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no); CANT_USE_STD=-DCANT_USE_STD]) +AC_CACHE_CHECK([for C++-standard library in std:: namespace], + [snl_cv_cxx_stl_in_std], + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include <vector> + #include <string> + #include <map> + #include <algorithm>], + [std::vector<std::string> v; + std::map<std::string,std::string> m; ], + [snl_cv_cxx_stl_in_std=yes], + [snl_cv_cxx_stl_in_std=no]) + AC_LANG_RESTORE]) + +if test snl_cv_cxx_stl_in_std = no; then + CANT_USE_STD=-DCANT_USE_STD +else + CANT_USE_STD= +fi -AC_MSG_CHECKING([for C++-standard I/O header files]) -AC_TRY_COMPILE([#include <iosfwd> - #include <iostream> - #include <ostream> - #include <sstream> - ], - [std::cout << std::endl;], - [AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no); CANT_USE_STD_IO=-DCANT_USE_STD_IO]) +AC_CACHE_CHECK([for C++-standard I/O in std:: namespace], + [snl_cv_cxx_io_in_std], + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include <iosfwd> + #include <iostream> + #include <ostream> + #include <sstream>], + [std::cout << std::endl;], + [snl_cv_cxx_io_in_std=yes], + [snl_cv_cxx_io_in_std=no]) + AC_LANG_RESTORE]) + +if test ssnl_cv_cxx_io_in_std = no; then + CANT_USE_STD_IO=-DCANT_USE_STD_IO +else + CANT_USE_STD_IO= +fi -AC_LANG_RESTORE ]) # SNL_CANT_USE_STD @@ -48,29 +62,35 @@ # Sets TEMPLATE_DEFS_INCLUDED=-DTEMPLATE_DEFS_INCLUDED ####################################################################################### AC_DEFUN([SNL_TEMPLATE_DEFS_INCLUDED], [ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_MSG_CHECKING([if template definitions should be included]) +AC_CACHE_CHECK([if C++ template definitions should be included], + [snl_cv_cxx_template_defs_included], + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS -src=conftest.cc -templ=conftemp.cc -exe=conftest + src=conftest.cc + templ=conftemp.cc + exe=conftest -echo "template <typename T> class MyTempl { public: T get() const; };" >$templ -echo "template <typename T> T MyTempl<T>::get() const { return 0; }" >>$templ -echo "template <typename T> class MyTempl { public: T get() const; };" >$src -echo "int main( ) { MyTempl<int> c; return c.get(); }" >>$src -if $CXX $CXXFLAGS $LDFLAGS $src $templ -o $exe >/dev/null 2>/dev/null; then + echo "template <typename T> class MyTempl { public: T get() const; };" >$templ + echo "template <typename T> T MyTempl<T>::get() const { return 0; }" >>$templ + echo "template <typename T> class MyTempl { public: T get() const; };" >$src + echo "int main( ) { MyTempl<int> c; return c.get(); }" >>$src + if $CXX $CXXFLAGS $LDFLAGS $src $templ -o $exe >/dev/null 2>/dev/null; then + snl_cv_cxx_template_defs_included=no + else + snl_cv_cxx_template_defs_included=yes + fi + + rm -f $src $templ $exe + AC_LANG_RESTORE]) + +if test snl_cv_cxx_template_defs_included = yes; then + TEMPLATE_DEFS_INCLUDED=-DTEMPLATE_DEFS_INCLUDED +else TEMPLATE_DEFS_INCLUDED= - AC_MSG_RESULT(no) -else - TEMPLATE_DEFS_INCLUDED=-DTEMPLATE_DEFS_INCLUDED - AC_MSG_RESULT(yes) fi -rm -f $src $templ $exe -AC_LANG_RESTORE ]) # SNL_TEMPLATE_DEFS_INCLUDED ####################################################################################### @@ -78,20 +98,44 @@ # Sets TEMPLATE_SPECIALIZATION=-DTEMPLATE_SPECIALIZATION ####################################################################################### AC_DEFUN([SNL_TEMPLATE_SPECIALIZATION], [ -AC_LANG_SAVE -AC_LANG_CPLUSPLUS +AC_CACHE_CHECK([if C++ compiler supports template class specialization], + [snl_cv_template_specialization], + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([template <unsigned S> class MyTempl { public: char data[S]; }; + template <> class MyTempl<0> { public: char value; };], + [MyTempl<1> one; MyTempl<0> zero; one.data[0] = zero.value = '\0';], + [snl_cv_template_specialization=yes], + [snl_cv_template_specialization=no]) + AC_LANG_RESTORE]) -AC_MSG_CHECKING([if C++ compiler supports template specialization]) -AC_TRY_COMPILE([ -template <unsigned S> class MyTempl { public: char data[S]; }; -template <> class MyTempl<0> { public: char value; }; -],[ -MyTempl<1> one; -MyTempl<0> zero; -one.data[0] = zero.value = '\0'; -], -[TEMPLATE_SPECIALIZATION=-DTEMPLATE_SPECIALIZATION; AC_MSG_RESULT(yes)], -[TEMPLATE_SPECIALIZATION=; AC_MSG_RESULT(no)]) +TEMPLATE_SPECIALIZATION= +if test $snl_cv_template_specialization=yes; then + TEMPLATE_SPECIALIZATION=-DTEMPLATE_SPECIALIZATION +fi -AC_LANG_RESTORE -]) # SNL_TEMPLATE_DEFS_INCLUDED +]) # SNL_TEMPLATE_SPECIALIZATION + +####################################################################################### +# Check if compiler supports template function specialization. +# Sets TEMPLATE_FUNC_SPECIALIZATION=-DTEMPLATE_FUNC_SPECIALIZATION +####################################################################################### +AC_DEFUN([SNL_TEMPLATE_FUNC_SPECIALIZATION], [ +AC_CACHE_CHECK([if C++ compiler supports template function specialization], + [snl_cv_template_func_specialization], + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([template <typename T> T templ_func( int i ); + template <> int templ_func<int>( int j ) + { return j; }], + [return templ_func<int>( 0 );], + [snl_cv_template_func_specialization=yes], + [snl_cv_template_func_specialization=no]) + AC_LANG_RESTORE]) + +TEMPLATE_FUNC_SPECIALIZATION= +if test $snl_cv_template_func_specialization=yes; then + TEMPLATE_FUNC_SPECIALIZATION=-DTEMPLATE_FUNC_SPECIALIZATION +fi + +]) # SNL_TEMPLATE_FUNC_SPECIALIZATION

1 0

r2166 - MOAB/trunk
by kraftche＠mcs.anl.gov 21 Oct '08

21 Oct '08

Author: kraftche Date: 2008-10-21 09:09:52 -0500 (Tue, 21 Oct 2008) New Revision: 2166 Modified: MOAB/trunk/VtkTest.cpp Log: fix syntax error w/ -pedantic flag--fixes nightly test issue Modified: MOAB/trunk/VtkTest.cpp =================================================================== --- MOAB/trunk/VtkTest.cpp 2008-10-21 14:04:54 UTC (rev 2165) +++ MOAB/trunk/VtkTest.cpp 2008-10-21 14:09:52 UTC (rev 2166) @@ -27,75 +27,75 @@ return 0; } -DECLARE_TEST(edge2); -DECLARE_TEST(edge3); -DECLARE_TEST(tri3); -DECLARE_TEST(tri6); -DECLARE_TEST(quad4); -DECLARE_TEST(quad8); -DECLARE_TEST(polygon); -DECLARE_TEST(tet4); -DECLARE_TEST(tet10); -DECLARE_TEST(hex8); -DECLARE_TEST(hex20); -DECLARE_TEST(wedge); -DECLARE_TEST(pyramid); +DECLARE_TEST(edge2) +DECLARE_TEST(edge3) +DECLARE_TEST(tri3) +DECLARE_TEST(tri6) +DECLARE_TEST(quad4) +DECLARE_TEST(quad8) +DECLARE_TEST(polygon) +DECLARE_TEST(tet4) +DECLARE_TEST(tet10) +DECLARE_TEST(hex8) +DECLARE_TEST(hex20) +DECLARE_TEST(wedge) +DECLARE_TEST(pyramid) -DECLARE_TEST(structured_points_2d); -DECLARE_TEST(structured_grid_2d); -DECLARE_TEST(rectilinear_grid_2d); -DECLARE_TEST(structured_points_3d); -DECLARE_TEST(structured_grid_3d); -DECLARE_TEST(rectilinear_grid_3d); +DECLARE_TEST(structured_points_2d) +DECLARE_TEST(structured_grid_2d) +DECLARE_TEST(rectilinear_grid_2d) +DECLARE_TEST(structured_points_3d) +DECLARE_TEST(structured_grid_3d) +DECLARE_TEST(rectilinear_grid_3d) -DECLARE_TEST(scalar_attrib_1_bit); -DECLARE_TEST(scalar_attrib_1_uchar); -DECLARE_TEST(scalar_attrib_1_char); -DECLARE_TEST(scalar_attrib_1_ushort); -DECLARE_TEST(scalar_attrib_1_short); -DECLARE_TEST(scalar_attrib_1_uint); -DECLARE_TEST(scalar_attrib_1_int); -DECLARE_TEST(scalar_attrib_1_ulong); -DECLARE_TEST(scalar_attrib_1_long); -DECLARE_TEST(scalar_attrib_1_float); -DECLARE_TEST(scalar_attrib_1_double); +DECLARE_TEST(scalar_attrib_1_bit) +DECLARE_TEST(scalar_attrib_1_uchar) +DECLARE_TEST(scalar_attrib_1_char) +DECLARE_TEST(scalar_attrib_1_ushort) +DECLARE_TEST(scalar_attrib_1_short) +DECLARE_TEST(scalar_attrib_1_uint) +DECLARE_TEST(scalar_attrib_1_int) +DECLARE_TEST(scalar_attrib_1_ulong) +DECLARE_TEST(scalar_attrib_1_long) +DECLARE_TEST(scalar_attrib_1_float) +DECLARE_TEST(scalar_attrib_1_double) -DECLARE_TEST(scalar_attrib_4_bit); -DECLARE_TEST(scalar_attrib_4_uchar); -DECLARE_TEST(scalar_attrib_4_char); -DECLARE_TEST(scalar_attrib_4_ushort); -DECLARE_TEST(scalar_attrib_4_short); -DECLARE_TEST(scalar_attrib_4_uint); -DECLARE_TEST(scalar_attrib_4_int); -DECLARE_TEST(scalar_attrib_4_ulong); -DECLARE_TEST(scalar_attrib_4_long); -DECLARE_TEST(scalar_attrib_4_float); -DECLARE_TEST(scalar_attrib_4_double); +DECLARE_TEST(scalar_attrib_4_bit) +DECLARE_TEST(scalar_attrib_4_uchar) +DECLARE_TEST(scalar_attrib_4_char) +DECLARE_TEST(scalar_attrib_4_ushort) +DECLARE_TEST(scalar_attrib_4_short) +DECLARE_TEST(scalar_attrib_4_uint) +DECLARE_TEST(scalar_attrib_4_int) +DECLARE_TEST(scalar_attrib_4_ulong) +DECLARE_TEST(scalar_attrib_4_long) +DECLARE_TEST(scalar_attrib_4_float) +DECLARE_TEST(scalar_attrib_4_double) -DECLARE_TEST(vector_attrib_bit); -DECLARE_TEST(vector_attrib_uchar); -DECLARE_TEST(vector_attrib_char); -DECLARE_TEST(vector_attrib_ushort); -DECLARE_TEST(vector_attrib_short); -DECLARE_TEST(vector_attrib_uint); -DECLARE_TEST(vector_attrib_int); -DECLARE_TEST(vector_attrib_ulong); -DECLARE_TEST(vector_attrib_long); -DECLARE_TEST(vector_attrib_float); -DECLARE_TEST(vector_attrib_double); +DECLARE_TEST(vector_attrib_bit) +DECLARE_TEST(vector_attrib_uchar) +DECLARE_TEST(vector_attrib_char) +DECLARE_TEST(vector_attrib_ushort) +DECLARE_TEST(vector_attrib_short) +DECLARE_TEST(vector_attrib_uint) +DECLARE_TEST(vector_attrib_int) +DECLARE_TEST(vector_attrib_ulong) +DECLARE_TEST(vector_attrib_long) +DECLARE_TEST(vector_attrib_float) +DECLARE_TEST(vector_attrib_double) -DECLARE_TEST(tensor_attrib_uchar); -DECLARE_TEST(tensor_attrib_char); -DECLARE_TEST(tensor_attrib_ushort); -DECLARE_TEST(tensor_attrib_short); -DECLARE_TEST(tensor_attrib_uint); -DECLARE_TEST(tensor_attrib_int); -DECLARE_TEST(tensor_attrib_ulong); -DECLARE_TEST(tensor_attrib_long); -DECLARE_TEST(tensor_attrib_float); -DECLARE_TEST(tensor_attrib_double); +DECLARE_TEST(tensor_attrib_uchar) +DECLARE_TEST(tensor_attrib_char) +DECLARE_TEST(tensor_attrib_ushort) +DECLARE_TEST(tensor_attrib_short) +DECLARE_TEST(tensor_attrib_uint) +DECLARE_TEST(tensor_attrib_int) +DECLARE_TEST(tensor_attrib_ulong) +DECLARE_TEST(tensor_attrib_long) +DECLARE_TEST(tensor_attrib_float) +DECLARE_TEST(tensor_attrib_double) -DECLARE_TEST(subset); +DECLARE_TEST(subset) int main( int argc, char* argv[] ) {

1 0