Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Removing leftovers of STL parallel mode experiments

Browse Source
This commit is contained in:
DennisOSRM 2012-04-14 18:01:06 +02:00
parent 539199a7e9
commit 969d5c8558
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Contractor/ContractionCleanup.h
View File

@ -21,11 +21,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
#ifndef CONTRACTIONCLEANUP_H_INCLUDED #ifndef CONTRACTIONCLEANUP_H_INCLUDED
#define CONTRACTIONCLEANUP_H_INCLUDED #define CONTRACTIONCLEANUP_H_INCLUDED
#ifdef _GLIBCXX_PARALLEL
#include <parallel/algorithm>
#else
#include <algorithm> #include <algorithm>
#endif
#ifndef _WIN32 #ifndef _WIN32
#include <sys/time.h> #include <sys/time.h>
#endif #endif
@ -120,11 +116,7 @@ public:
edges.push_back( newEdge ); edges.push_back( newEdge );
} }
} }
#ifdef _GLIBCXX_PARALLEL
__gnu_parallel::sort( edges.begin(), edges.end() );
#else
sort( edges.begin(), edges.end() ); sort( edges.begin(), edges.end() );
#endif
} }
private: private:

8
DataStructures/StaticKDTree.h
View File

@ -24,11 +24,7 @@ KD Tree coded by Christian Vetter, Monav Project
#define STATICKDTREE_H_INCLUDED #define STATICKDTREE_H_INCLUDED
#include <vector> #include <vector>
#ifdef _GLIBCXX_PARALLEL
#include <parallel/algorithm>
#else
#include <algorithm> #include <algorithm>
#endif
#include <stack> #include <stack>
#include <limits> #include <limits>
@ -119,11 +115,7 @@ public:
continue; continue;
Iterator middle = tree.left + ( tree.right - tree.left ) / 2; Iterator middle = tree.left + ( tree.right - tree.left ) / 2;
#ifdef _GLIBCXX_PARALLEL
__gnu_parallel::nth_element( kdtree + tree.left, kdtree + middle, kdtree + tree.right, Less( tree.dimension ) );
#else
std::nth_element( kdtree + tree.left, kdtree + middle, kdtree + tree.right, Less( tree.dimension ) ); std::nth_element( kdtree + tree.left, kdtree + middle, kdtree + tree.right, Less( tree.dimension ) );
#endif
s.push( Tree( tree.left, middle, ( tree.dimension + 1 ) % k ) ); s.push( Tree( tree.left, middle, ( tree.dimension + 1 ) % k ) );
s.push( Tree( middle + 1, tree.right, ( tree.dimension + 1 ) % k ) ); s.push( Tree( middle + 1, tree.right, ( tree.dimension + 1 ) % k ) );
} }

8
Util/GraphLoader.h
View File

@ -23,6 +23,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>
#include <algorithm>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
@ -30,12 +32,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#ifdef _GLIBCXX_PARALLEL
#include <parallel/algorithm>
#else
#include <algorithm>
#endif
#include "../DataStructures/ImportEdge.h" #include "../DataStructures/ImportEdge.h"
#include "../typedefs.h" #include "../typedefs.h"