Changeset 854

Timestamp:

01/22/08 17:56:58

Author:

robert

Message:

Completed work on automatic selection of split levels

Files:

• trunk/include/vpb/BuildOptions (modified) (2 diffs)
• trunk/include/vpb/DataSet (modified) (1 diff)
• trunk/src/vpb/BuildOptions.cpp (modified) (2 diffs)
• trunk/src/vpb/BuildOptionsIO.cpp (modified) (1 diff)
• trunk/src/vpb/Commandline.cpp (modified) (2 diffs)
• trunk/src/vpb/DataSet.cpp (modified) (7 diffs)
• trunk/src/vpb/TaskManager.cpp (modified) (1 diff)

trunk/include/vpb/BuildOptions

@@ -197 +197 @@
-        void setDistributedBuildSplitLevel(unsigned int level) { _distributedBuildSplitLevel = level; }
-        unsigned int getDistributedBuildSplitLevel() const { return _distributedBuildSplitLevel; }
+
+        void setDistributedBuildSecondarySplitLevel(unsigned int level) { _distributedBuildSecondarySplitLevel = level; }
+        unsigned int getDistributedBuildSecondarySplitLevel() const { return _distributedBuildSecondarySplitLevel; }
-
-        void setRecordSubtileFileNamesOnLeafTile(bool recordSubtileFileNamesOnLeafTile) { _recordSubtileFileNamesOnLeafTile = recordSubtileFileNamesOnLeafTile; }
@@ -277 +280 @@
-        
-        unsigned int                                _distributedBuildSplitLevel;
+        unsigned int                                _distributedBuildSecondarySplitLevel;
+
-        bool                                        _recordSubtileFileNamesOnLeafTile;
-        bool                                        _generateSubtile;

trunk/include/vpb/DataSet

@@ -215 +215 @@
-        bool computeOptimumTileSystemDimensions(int& C1, int& R1);
-        CompositeDestination* createDestinationTile(int level, int tileX, int tileY);
-
-
-
-
+
+
+
+
+
-
-        osg::ref_ptr<CompositeSource>               _sourceGraph;

trunk/src/vpb/BuildOptions.cpp

@@ -57 +57 @@
-    
-    _distributedBuildSplitLevel = 0;
+    _distributedBuildSecondarySplitLevel = 0;
-    _recordSubtileFileNamesOnLeafTile = false;
-    _generateSubtile = false;
@@ -123 +124 @@
-    _writeNodeBeforeSimplification = rhs._writeNodeBeforeSimplification;
-    _distributedBuildSplitLevel = rhs._distributedBuildSplitLevel;
+    _distributedBuildSecondarySplitLevel = rhs._distributedBuildSecondarySplitLevel;
-    _recordSubtileFileNamesOnLeafTile = rhs._recordSubtileFileNamesOnLeafTile;
-    _generateSubtile = rhs._generateSubtile;

trunk/src/vpb/BuildOptionsIO.cpp

@@ -199 +199 @@
-        
-        ADD_UINT_PROPERTY(DistributedBuildSplitLevel);
+        ADD_UINT_PROPERTY(DistributedBuildSecondarySplitLevel);
-        ADD_BOOL_PROPERTY(RecordSubtileFileNamesOnLeafTile);
-        ADD_BOOL_PROPERTY(GenerateSubtile);

trunk/src/vpb/Commandline.cpp

@@ -473 +473 @@
-    usage.addCommandLineOption("--record-subtile-on-leaf-tiles","Enable the setting of the subtile file name of the leaf tiles.");
-    usage.addCommandLineOption("--split","Set the distributed build split level.");
+    usage.addCommandLineOption("--splits","Set the distributed build primary and secondary split levels.");
-    usage.addCommandLineOption("--run-path","Set the path that the build should be run from.");
-    usage.addCommandLineOption("--notify-level","Set the notify level when logging messages.");
@@ -536 +537 @@
-    {
-        buildOptions->setDistributedBuildSplitLevel(splitLevel);
+    }
+
+    unsigned int secondarySplitLevel;
+    while(arguments.read("--splits",splitLevel, secondarySplitLevel))
+    {
+        buildOptions->setDistributedBuildSplitLevel(splitLevel);
+        buildOptions->setDistributedBuildSecondarySplitLevel(secondarySplitLevel);
-    }
-

trunk/src/vpb/DataSet.cpp

@@ -212 +212 @@
-}
-
+int DataSet::computeMaximumLevel(int maxNumLevels)
+{
+    int maxLevel = 0;
+    for(CompositeSource::source_iterator itr(_sourceGraph.get());itr.valid();++itr)
+    {
+        Source* source = (*itr).get();
+
+        
+        SourceData* sd = (*itr)->getSourceData();
+        if (!sd)
+        {
+            log(osg::NOTICE,"Skipping source %s as no data loaded from it.",source->getFileName().c_str());
+            continue;
+        }
+        
+        if (source->getType()!=Source::IMAGE && source->getType()!=Source::HEIGHT_FIELD)
+        {
+            // place models and shapefiles into a separate temporary source list and then process these after
+            // the main handling of terrain/imagery sources.
+            continue;
+            
+        }
+
+        int k = 0;
+        if (!computeOptimumLevel(source, maxNumLevels-1, k)) continue;
+        
+        if (k>maxLevel)
+        {
+            maxLevel = k;
+        }
+    }
+    
+    return maxLevel;
+}
+
-bool DataSet::computeOptimumTileSystemDimensions(int& C1, int& R1)
-{
@@ -386 +421 @@
-    
-    _newDestinationGraph = true;
-
-
-
-
-
+
-    typedef std::list< osg::ref_ptr<Source> > SourceList;
-    SourceList modelSources;
@@ -1120 +1151 @@
-    _numTextureLevels = maxTextureUnit+1;
-
+    computeOptimumTileSystemDimensions(_C1,_R1);
-
-    log(osg::INFO, "extents = xMin() %f %f",_destinationExtents.xMin(),_destinationExtents.xMax());
@@ -1130 +1162 @@
-{
-    if (!prepareForDestinationGraphCreation()) return;
-
-#if 0
-    if (!_sourceGraph) return;
-
-    // ensure we have a valid coordinate system
-    if (_destinationCoordinateSystemString.empty()&& !getConvertFromGeographicToGeocentric())
-    {
-        for(CompositeSource::source_iterator itr(_sourceGraph.get());itr.valid();++itr)
-        {
-            SourceData* sd = (*itr)->getSourceData();
-            if (sd)
-            {
-                if (sd->_cs.valid())
-                {
-                    _destinationCoordinateSystem = sd->_cs;
-                    log(osg::INFO,"Setting coordinate system to %s",_destinationCoordinateSystem->getCoordinateSystem().c_str());
-                    break;
-                }
-            }
-        }
-    }
-    
-    
-    assignIntermediateCoordinateSystem();
-
-    CoordinateSystemType destinateCoordSytemType = getCoordinateSystemType(_destinationCoordinateSystem.get());
-    if (destinateCoordSytemType==GEOGRAPHIC && !getConvertFromGeographicToGeocentric())
-    {
-        // convert elevation into degrees.
-        setVerticalScale(1.0f/111319.0f);
-    }
-
-    // get the extents of the sources and
-    _destinationExtents = _extents;
-    _destinationExtents._isGeographic = destinateCoordSytemType==GEOGRAPHIC;
-
-    // sort the sources so that the lowest res tiles are drawn first.
-    {
-    
-#if 0    
-        for(CompositeSource::source_iterator itr(_sourceGraph.get());itr.valid();++itr)
-        {
-            Source* source = itr->get();
-            if (source)
-            {
-                source->setSortValueFromSourceDataResolution(_intermediateCoordinateSystem.get());
-                log(osg::INFO, "sort %s value %f",source->getFileName().c_str(),source->getSortValue());
-            }
-            
-        }
-        
-        // sort them so highest sortValue is first.
-#endif
-        _sourceGraph->setSortValueFromSourceDataResolution(_intermediateCoordinateSystem.get());
-        _sourceGraph->sort();
-    }
-
-    if (!_destinationExtents.valid()) 
-    {
-        for(CompositeSource::source_iterator itr(_sourceGraph.get());itr.valid();++itr)
-        {
-            SourceData* sd = (*itr)->getSourceData();
-            if (sd)
-            {
-                GeospatialExtents local_extents(sd->getExtents(_intermediateCoordinateSystem.get()));
-                log(osg::INFO, "local_extents = xMin() %f %f",local_extents.xMin(),local_extents.xMax());
-                log(osg::INFO, "                yMin() %f %f",local_extents.yMin(),local_extents.yMax());
-                
-                if (destinateCoordSytemType==GEOGRAPHIC)
-                {
-                    // need to clamp within -180 and 180 range.
-                    if (local_extents.xMin()>180.0) 
-                    {
-                        // shift back to -180 to 180 range
-                        local_extents.xMin() -= 360.0;
-                        local_extents.xMax() -= 360.0;
-                    }
-                    else if (local_extents.xMin()<-180.0) 
-                    {
-                        // shift back to -180 to 180 range
-                        local_extents.xMin() += 360.0;
-                        local_extents.xMax() += 360.0;
-                    }
-                }
-
-                _destinationExtents.expandBy(local_extents);
-            }
-        }
-    }
-    
-
-    if (destinateCoordSytemType==GEOGRAPHIC)
-    {
-        double xRange = _destinationExtents.xMax() - _destinationExtents.xMin();
-        if (xRange>360.0) 
-        {
-            // clamp to proper 360 range.
-            _destinationExtents.xMin() = -180.0;
-            _destinationExtents.xMax() = 180.0;
-        }
-    }
-    
-
-    // compute the number of texture layers required.
-    unsigned int maxTextureUnit = 0;
-    for(CompositeSource::source_iterator sitr(_sourceGraph.get());sitr.valid();++sitr)
-    {
-        Source* source = sitr->get();
-        if (source) 
-        {
-            if (maxTextureUnit<source->getLayer()) maxTextureUnit = source->getLayer();
-        }
-    }
-    _numTextureLevels = maxTextureUnit+1;
-
-
-    log(osg::INFO, "extents = xMin() %f %f",_destinationExtents.xMin(),_destinationExtents.xMax());
-    log(osg::INFO, "          yMin() %f %f",_destinationExtents.yMin(),_destinationExtents.yMax());
-
-#endif
-
-    osg::Timer_t before = osg::Timer::instance()->tick();
@@ -2409 +2321 @@
-}
-
+void DataSet::selectAppropriateSplitLevels()
+{
+    int maxLevel = computeMaximumLevel(getMaximumNumOfLevels());
+    log(osg::NOTICE,"Computed maximum source level = %i", maxLevel);
+
+    if (getDistributedBuildSplitLevel()==0)
+    {
+        if (getDistributedBuildSecondarySplitLevel()==0)
+        {
+            // need to compute both primary and secodary split levels
+            if (maxLevel<10)
+            {
+                // just use primary split level
+                setDistributedBuildSplitLevel((maxLevel * 2) / 5);
+            }
+            else
+            {
+                setDistributedBuildSplitLevel(maxLevel / 4);
+                setDistributedBuildSecondarySplitLevel((maxLevel * 5) / 9);
+            }
+        }
+        else
+        {
+            // need to compute the primary split level only
+            setDistributedBuildSplitLevel(getDistributedBuildSecondarySplitLevel()/2);
+        }
+    }
+    else
+    {
+        if (maxLevel>=10 && getDistributedBuildSecondarySplitLevel()==0)
+        {
+            // need to compute just the seconary split level
+            setDistributedBuildSecondarySplitLevel(
+                        getDistributedBuildSplitLevel() +
+                        (maxLevel-getDistributedBuildSplitLevel())/2 );
+        }
+        else
+        {
+            // primary and secondary split levels fully specified.
+        }
+    }
+    
+    if (getDistributedBuildSplitLevel()>=maxLevel)
+    {
+        log(osg::NOTICE,"Warning: primary split level exceed maximum source level, switching off primary split level.");
+        setDistributedBuildSplitLevel(0);
+    }
+    
+    if (getDistributedBuildSecondarySplitLevel()>=maxLevel)
+    {
+        log(osg::NOTICE,"Warning: secondary split level exceed maximum source level, switching off secondary split level.");
+        setDistributedBuildSecondarySplitLevel(0);
+    }
+    
+    if (getDistributedBuildSecondarySplitLevel()!=0 &&
+        getDistributedBuildSecondarySplitLevel()<=getDistributedBuildSplitLevel())
+    {
+        log(osg::NOTICE,"Warning: secondary split level is not permited to be lower than or equal to the primary split level, switching off secondary split level.");
+        setDistributedBuildSecondarySplitLevel(0);
+    }
+
+
+    if (getDistributedBuildSecondarySplitLevel()==0)
+    {
+        log(osg::NOTICE,"Selected single split at %i",getDistributedBuildSplitLevel());
+    }
+    else
+    {
+        log(osg::NOTICE,"Selected primary split at %i, secondary split at %i",
+            getDistributedBuildSplitLevel(),
+            getDistributedBuildSecondarySplitLevel());
+    }
+    
+    
+}
+
+
-bool DataSet::generateTasks_new(TaskManager* taskManager)
-{
@@ -2428 +2417 @@
-    if (!prepareForDestinationGraphCreation()) return false;
-
-    computeOptimumTileSystemDimensions(_C1,_R1);
-    log(osg::NOTICE,"      C1=%i R1=%i",_C1,_R1);
-
-
-
-    log(osg::NOTICE,"OK, OK I now need something to do...");
-    
-
-
+
+
+
+
-    log(osg::NOTICE,"Then generate the root task");
-    log(osg::NOTICE,"Then generate the intermediate tasks if any");
@@ -2451 +2437 @@
-bool DataSet::generateTasks_old(TaskManager* taskManager)
-{
+    if (!getLogFileName().empty())
+    {
+        if (!getBuildLog()) setBuildLog(new BuildLog());
+    
+        getBuildLog()->openLogFile(getLogFileName());
+    }
+
+    if (getBuildLog())
+    {
+        pushOperationLog(getBuildLog());
+    }
+    
+    loadSources();
+
+    if (!prepareForDestinationGraphCreation()) return false;
+
+    selectAppropriateSplitLevels();
+
-    if (getDistributedBuildSplitLevel()==0) return false;
-
-    if (!getLogFileName().empty())
-    {
-        if (!getBuildLog()) setBuildLog(new BuildLog());
-    
-        getBuildLog()->openLogFile(getLogFileName());
-    }
-
-    if (getBuildLog())
-    {
-        pushOperationLog(getBuildLog());
-    }
-    
-    loadSources();
-
-    computeDestinationGraphFromSources(getDistributedBuildSplitLevel()+1);

trunk/src/vpb/TaskManager.cpp

@@ -103 +103 @@
-    while (arguments.read("--build-name",_buildName)) {}
-    
-
-    DatabaseBuilder* db = dynamic_cast<DatabaseBuilder*>(_terrain->getTerrainTechnique());
-    BuildOptions* bo = db->getBuildOptions();
-    if (bo)
-    {
-        if (bo->getDistributedBuildSplitLevel()==0)
-        {
-            unsigned int maxLevel = bo->getMaximumNumOfLevels();
-            unsigned int halfLevel = (maxLevel / 2);
-            if (halfLevel>=1)
-            {
-                bo->setDistributedBuildSplitLevel(osg::minimum(halfLevel,4u));
-            }
-        }
-    }
-    
-    log(osg::NOTICE,"setDistributedBuildSplitLevel=%d",bo->getDistributedBuildSplitLevel());
-
-    if (!terrainOutputName.empty())
-    {