Changeset 2364 for GTP/trunk/Lib


Ignore:
Timestamp:
05/10/07 14:46:52 (18 years ago)
Author:
mattausch
Message:
 
Location:
GTP/trunk/Lib/Vis/Preprocessing/scripts
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.env

    r2350 r2364  
    2121        loadMeshes false 
    2222        # internal raycaster 
    23         #rayCastMethod 0   
     23        rayCastMethod 0   
    2424        # intel raycaster 
    25         rayCastMethod 1 
     25        #rayCastMethod 1 
    2626        exportVisibility false 
    2727        applyVisibilityFilter false 
    … …  
    179179         
    180180        Evaluation { 
    181                 samples         6000000 
    182                 samplesForStats 2000000 
     181                samples         80000000 
     182                samplesForStats 40000000 
    183183 
    184184                samplesPerPass  500000 
    … …  
    231231        Construction {           
    232232                renderCostDecreaseWeight 0.999 
    233 #               renderCostDecreaseWeight 1.0 
     233                #renderCostDecreaseWeight 1.0 
    234234        } 
    235235 
    … …  
    264264        Construction { 
    265265 
    266                 samples 100000 
     266                samples 5000000 
    267267 
    268268                # type 0 = sequential computation, 1 = interleaved, 2 = gradient 
    … …  
    286286        Termination { 
    287287                # maximal number of leaves 
    288                 maxLeaves 10000 
     288                maxLeaves 100000 
    289289                # maximal memory in MB 
    290290#               maxMemory 4 
    291                 maxMemory 25 
     291                maxMemory 20 
    292292                # minimum ratio of global cost decrease 
    293293                minGlobalCostRatio -1 

  • GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.sh

    r2350 r2364  
    77TARGET=release 
    88 
    9 PROGRAM=../bin/$TARGET/Preprocessor2.exe 
    10 #PROGRAM=../bin/$TARGET/Preprocessor_old.exe 
     9PROGRAM=../bin/$TARGET/Preprocessor.exe 
    1110#PROGRAM=../bin/$TARGET/Preprocessor_itl.exe 
    1211 
    1312EXT=obj 
    14 SCENE=vienna_cropped 
    15 SCENE_PATH=../data/vienna 
    1613 
    17 #SCENE=arena-high-lods 
    18 #SCENE_PATH=../data/Arena 
     14#SCENE=vienna_cropped 
     15#SCENE_PATH=../data/vienna 
    1916 
    20 SCENE=soda 
    21 SCENE_PATH=../data/soda 
     17SCENE=arena-high-lods 
     18SCENE_PATH=../data/Arena 
    2219 
    23 ENVIRONMENT=gi_final.env 
    24 LOG_PREFIX=../scripts/tests/gi/$SCENE-test 
     20#SCENE=soda 
     21#SCENE_PATH=../data/soda 
     22 
     23ENVIRONMENT=gi_final2.env 
     24LOG_PREFIX=../scripts/tests/gi/$SCENE 
    2525 
    2626echo "starting $TARGET mode for $SCENE scene ($PROGRAM)" 
    … …  
    2828SCENE_FILENAME=$SCENE_PATH/$SCENE.$EXT 
    2929 
     30OBJ_WEIGHT=70 
     31 
     32####################################################### 
     33 
     34NODES=30000 
     35USE_HEUR=false 
     36METHOD=seq-$NODES-$USE_HEUR-$OBJ_WEIGHT 
     37  
     38echo "$SCENE $METHOD" 
     39$PROGRAM $ENVIRONMENT \ 
     40 -scene_filename=$SCENE_FILENAME \ 
     41 -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     42 -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     43 -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \ 
     44 -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
     45 -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
     46 -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
     47 -hierarchy_construction_type=0 \ 
     48 -view_cells_triangle_weight=1.0 \ 
     49 -view_cells_object_weight=$OBJ_WEIGHT \ 
     50 -vsp_use_cost_heuristics=$USE_HEUR \ 
     51 -bvh_term_max_leaves=$NODES 
     52 
     53sh movefiles.sh $LOG_PREFIX-$METHOD 
     54 
     55 
     56####################################################### 
     57 
     58NODES=3000 
     59USE_HEUR=false 
     60METHOD=seq-$NODES-$USE_HEUR-$OBJ_WEIGHT 
     61  
     62echo "$SCENE $METHOD" 
     63$PROGRAM $ENVIRONMENT \ 
     64 -scene_filename=$SCENE_FILENAME \ 
     65 -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     66 -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     67 -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \ 
     68 -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
     69 -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
     70 -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
     71 -hierarchy_construction_type=0 \ 
     72 -view_cells_triangle_weight=1.0 \ 
     73 -view_cells_object_weight=$OBJ_WEIGHT \ 
     74 -vsp_use_cost_heuristics=$USE_HEUR \ 
     75 -bvh_term_max_leaves=$NODES 
     76 
     77sh movefiles.sh $LOG_PREFIX-$METHOD 
     78 
     79####################################################### 
     80 
     81NODES=1000 
     82USE_HEUR=false 
     83METHOD=seq-$NODES-$USE_HEUR-$OBJ_WEIGHT 
     84  
     85echo "$SCENE $METHOD" 
     86$PROGRAM $ENVIRONMENT \ 
     87 -scene_filename=$SCENE_FILENAME \ 
     88 -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     89 -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     90 -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \ 
     91 -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
     92 -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
     93 -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
     94 -hierarchy_construction_type=0 \ 
     95 -view_cells_triangle_weight=1.0 \ 
     96 -view_cells_object_weight=$OBJ_WEIGHT \ 
     97 -vsp_use_cost_heuristics=$USE_HEUR \ 
     98 -bvh_term_max_leaves=$NODES 
     99 
     100sh movefiles.sh $LOG_PREFIX-$METHOD 
     101 
     102 
    30103####################################################### 
    31104 
    32105USE_HEUR=false 
    33 METHOD=int-$USE_HEUR 
     106 
     107METHOD=int-$USE_HEUR-$OBJ_WEIGHT-nosah 
    34108 
    35109echo "$SCENE $METHOD" 
    … …  
    41115  -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \ 
    42116  -view_cells_triangle_weight=1.0 \ 
    43   -view_cells_object_weight=0.0 \ 
     117  -view_cells_object_weight=$OBJ_WEIGHT \ 
    44118  -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
    45119  -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
    … …  
    48122  -hierarchy_construction_min_avg_rays_per_object=0 \ 
    49123  -hierarchy_construction_max_avg_rays_per_object=0 \ 
    50   -bvh_use_sah=true \ 
     124  -bvh_use_sah=false \ 
    51125  -vsp_use_cost_heuristics=$USE_HEUR 
    52126 
    53127sh movefiles.sh $LOG_PREFIX-$METHOD 
    54128 
     129 
     130####################################################### 
     131 
     132USE_HEUR=false 
     133 
     134METHOD=int-$USE_HEUR-$OBJ_WEIGHT-nosah 
     135 
     136echo "$SCENE $METHOD" 
     137$PROGRAM $ENVIRONMENT \ 
     138  -scene_filename=$SCENE_FILENAME \ 
     139  -view_cells_sampling_type=object_directional \ 
     140  -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     141  -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     142  -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \ 
     143  -view_cells_triangle_weight=1.0 \ 
     144  -view_cells_object_weight=$OBJ_WEIGHT \ 
     145  -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
     146  -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
     147  -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
     148  -hierarchy_construction_type=2 \ 
     149  -hierarchy_construction_min_avg_rays_per_object=0 \ 
     150  -hierarchy_construction_max_avg_rays_per_object=0 \ 
     151  -bvh_use_sah=false \ 
     152  -vsp_use_cost_heuristics=$USE_HEUR 
     153 
     154sh movefiles.sh $LOG_PREFIX-$METHOD 
    55155 
    56156 
    … …  
    59159NODES=60000 
    60160USE_HEUR=false 
    61 METHOD=seq-$NODES-$USE_HEUR 
     161METHOD=seq-$NODES-$USE_HEUR-$OBJ_WEIGHT 
    62162  
    63163#echo "$SCENE $METHOD" 
    64 # $PROGRAM $ENVIRONMENT \ 
     164#$PROGRAM $ENVIRONMENT \ 
    65165 -scene_filename=$SCENE_FILENAME \ 
    66166 -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    … …  
    72172 -hierarchy_construction_type=0 \ 
    73173 -view_cells_triangle_weight=1.0 \ 
    74  -view_cells_object_weight=50.0 \ 
     174 -view_cells_object_weight=$OBJ_WEIGHT \ 
    75175 -vsp_use_cost_heuristics=$USE_HEUR \ 
    76176 -bvh_term_max_leaves=$NODES 
Note: See TracChangeset for help on using the changeset viewer.