chore: gpuAggregation set to true (#9301)

visgl · Dec 22, 2024 · 05f8c95 · 05f8c95
1 parent 5a41ddd
commit 05f8c95
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 12 deletions.
diff --git a/examples/layer-browser/src/examples/aggregation-layers.js b/examples/layer-browser/src/examples/aggregation-layers.js
@@ -31,7 +31,7 @@ const ContourLayerExample = {
     id: 'contourLayer',
     cellSize: 200,
     getPosition: d => d.COORDINATES,
-    gpuAggregation: false, // TODO(v9): Re-enable GPU aggregation.
+    gpuAggregation: true,
     contours: [
       {threshold: 1, color: [255, 0, 0], strokeWidth: 4},
       {threshold: 5, color: [0, 255, 0], strokeWidth: 2},
@@ -47,7 +47,7 @@ const ContourLayerBandsExample = {
     id: 'contourLayer',
     cellSize: 200,
     getPosition: d => d.COORDINATES,
-    gpuAggregation: false, // TODO(v9): Re-enable GPU aggregation.
+    gpuAggregation: true,
     contours: [
       {threshold: [1, 5], color: [255, 0, 0]},
       {threshold: [5, 15], color: [0, 255, 0]},

diff --git a/examples/website/3d-heatmap/app.tsx b/examples/website/3d-heatmap/app.tsx
@@ -89,7 +89,7 @@ export default function App({
   const layers = [
     new HexagonLayer<DataPoint>({
       id: 'heatmap',
-      // gpuAggregation: true,
+      gpuAggregation: true,
       colorRange,
       coverage,
       data,

diff --git a/examples/website/screen-grid/app.tsx b/examples/website/screen-grid/app.tsx
@@ -39,7 +39,7 @@ type DataPoint = [longitude: number, latitude: number, count: number];
 export default function App({
   data = DATA_URL,
   cellSize = 20,
-  gpuAggregation = false, // TODO(v9): Re-enable GPU aggregation.
+  gpuAggregation = true,
   aggregation = 'SUM',
   mapStyle = MAP_STYLE
 }: {

diff --git a/modules/aggregation-layers/src/grid-layer/grid-layer.ts b/modules/aggregation-layers/src/grid-layer/grid-layer.ts
@@ -33,7 +33,7 @@ import {BinOptions, binOptionsUniforms} from './bin-options-uniforms';
 function noop() {}
 
 const defaultProps: DefaultProps<GridLayerProps> = {
-  gpuAggregation: false,
+  gpuAggregation: true,
 
   // color
   colorDomain: null,
@@ -239,7 +239,7 @@ type _GridLayerProps<DataT> = {
 
   /**
    * When set to true, aggregation is performed on GPU, provided other conditions are met.
-   * @default false
+   * @default true
    */
   gpuAggregation?: boolean;
 };

diff --git a/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.ts b/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.ts
@@ -34,7 +34,7 @@ import {BinOptions, binOptionsUniforms} from './bin-options-uniforms';
 function noop() {}
 
 const defaultProps: DefaultProps<HexagonLayerProps> = {
-  gpuAggregation: false,
+  gpuAggregation: true,
 
   // color
   colorDomain: null,
@@ -241,7 +241,7 @@ type _HexagonLayerProps<DataT> = {
 
   /**
    * When set to true, aggregation is performed on GPU, provided other conditions are met.
-   * @default false
+   * @default true
    */
   gpuAggregation?: boolean;
 };

diff --git a/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.ts b/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.ts
@@ -29,7 +29,7 @@ const defaultProps: DefaultProps<ScreenGridLayerProps> = {
   getPosition: {type: 'accessor', value: (d: any) => d.position},
   getWeight: {type: 'accessor', value: 1},
 
-  gpuAggregation: false,
+  gpuAggregation: true,
   aggregation: 'SUM'
 };
 

diff --git a/test/modules/aggregation-layers/grid-layer.spec.ts b/test/modules/aggregation-layers/grid-layer.spec.ts
@@ -43,10 +43,22 @@ test('GridLayer#getAggregatorType', t => {
       {
         title: 'Default',
         props: SAMPLE_PROPS,
+        onAfterUpdate({layer}) {
+          t.ok(
+            layer.state.aggregator instanceof WebGLAggregator,
+            'By default should use GPU Aggregation'
+          );
+        }
+      },
+      {
+        title: 'Disable gpuAggregation',
+        updateProps: {
+          gpuAggregation: false
+        },
         onAfterUpdate({layer}) {
           t.ok(
             layer.state.aggregator instanceof CPUAggregator,
-            'By default should use CPU Aggregation'
+            'Should use CPU Aggregation (gpuAggregation: false)'
           );
         }
       },

diff --git a/test/modules/aggregation-layers/hexagon-layer.spec.ts b/test/modules/aggregation-layers/hexagon-layer.spec.ts
@@ -43,10 +43,22 @@ test('HexagonLayer#getAggregatorType', t => {
       {
         title: 'Default',
         props: SAMPLE_PROPS,
+        onAfterUpdate({layer}) {
+          t.ok(
+            layer.state.aggregator instanceof WebGLAggregator,
+            'By default should use GPU Aggregation'
+          );
+        }
+      },
+      {
+        title: 'Disable gpuAggregation',
+        updateProps: {
+          gpuAggregation: false
+        },
         onAfterUpdate({layer}) {
           t.ok(
             layer.state.aggregator instanceof CPUAggregator,
-            'By default should use CPU Aggregation'
+            'Should use CPU Aggregation (gpuAggregation: false)'
           );
         }
       },

diff --git a/website/src/examples/screen-grid-layer.js b/website/src/examples/screen-grid-layer.js
@@ -20,7 +20,7 @@ class ScreenGridDemo extends Component {
   };
 
   static parameters = {
-    gpuAggregation: {displayName: 'GPU Acceleration', type: 'checkbox', value: false},
+    gpuAggregation: {displayName: 'GPU Acceleration', type: 'checkbox', value: true},
     cellSize: {displayName: 'Cell Size', type: 'range', value: 5, step: 1, min: 1, max: 20}
   };