From 780d45ade9623820eda52cce2538eb4ac846dba0 Mon Sep 17 00:00:00 2001 From: 1chandu Date: Tue, 3 Dec 2019 14:15:19 -0800 Subject: [PATCH] GPUGridAggregator: minor cleanup --- .../src/utils/gpu-grid-aggregation/gpu-grid-aggregator.js | 1 - .../aggregation-layers/utils/gpu-grid-aggregator.spec.js | 5 ----- 2 files changed, 6 deletions(-) diff --git a/modules/aggregation-layers/src/utils/gpu-grid-aggregation/gpu-grid-aggregator.js b/modules/aggregation-layers/src/utils/gpu-grid-aggregation/gpu-grid-aggregator.js index 11b3cf2f5b6..f0e9643f75c 100644 --- a/modules/aggregation-layers/src/utils/gpu-grid-aggregation/gpu-grid-aggregator.js +++ b/modules/aggregation-layers/src/utils/gpu-grid-aggregation/gpu-grid-aggregator.js @@ -301,7 +301,6 @@ export default class GPUGridAggregator { results[id] = {}; const {needMin, needMax, combineMaxMin} = weights[id]; results[id].aggregationTexture = textures[id]; - // console.log(`Reading GPU aggregation results for weight:${id} into ${weights[id].aggregationBuffer.id}`); results[id].aggregationBuffer = readPixelsToBuffer(framebuffers[id], { target: weights[id].aggregationBuffer, // update if a buffer is provided sourceType: GL.FLOAT diff --git a/test/modules/aggregation-layers/utils/gpu-grid-aggregator.spec.js b/test/modules/aggregation-layers/utils/gpu-grid-aggregator.spec.js index 2aae3eff096..6807280cccd 100644 --- a/test/modules/aggregation-layers/utils/gpu-grid-aggregator.spec.js +++ b/test/modules/aggregation-layers/utils/gpu-grid-aggregator.spec.js @@ -37,10 +37,7 @@ function testCounterMinMax(aggregator, t, opts) { let weight1 = Object.assign({}, fixture.weights.weight1, {size}); let results = aggregator.run(Object.assign({}, fixture, {weights: {weight1}, useGPU})); - // GPUGridAggregator.logData(results.weight1); - // const minData = results.weight1.minBuffer.getData(); - // const maxData = results.weight1.maxBuffer.getData(); const {minData, maxData} = aggregator.getData('weight1'); t.equal(maxData[3], 3, `${testName} needMax: total count should match`); t.equal(minData[3], 3, `${testName} needMin: total count should match`); @@ -125,8 +122,6 @@ function testAggregationOperations(opts) { const cpuResults = cpuAggregator(aggregationOpts); let results = gpuAggregator.run(aggregationOpts); - // results = gpuAggregator.run(aggregationOpts); - const gpuResults = { minData: results.weight1.minBuffer.getData(), maxData: results.weight1.maxBuffer.getData()