This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp | |
index 76c45aef7..a45c14d45 100644 | |
--- a/src/mbgl/renderer/renderer_impl.cpp | |
+++ b/src/mbgl/renderer/renderer_impl.cpp | |
@@ -31,6 +31,8 @@ | |
#include <mbgl/util/string.hpp> | |
#include <mbgl/util/logging.hpp> | |
+#import <QuartzCore/QuartzCore.h> | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m | |
index 630fefde2..b6333cc33 100644 | |
--- a/platform/ios/app/MBXViewController.m | |
+++ b/platform/ios/app/MBXViewController.m | |
@@ -509,7 +509,16 @@ - (void)performActionForSettingAtIndexPath:(NSIndexPath *)indexPath | |
switch (indexPath.row) | |
{ | |
case MBXSettingsDebugToolsResetPosition: | |
- [self.mapView resetPosition]; | |
+ // [self.mapView resetPosition]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/integration_tests/benchmarks/benchmark_test.ts b/integration_tests/benchmarks/benchmark_test.ts | |
index 8148ea22..7a38c6da 100644 | |
--- a/integration_tests/benchmarks/benchmark_test.ts | |
+++ b/integration_tests/benchmarks/benchmark_test.ts | |
@@ -16,8 +16,8 @@ | |
*/ | |
import {ConvGPUBenchmark, RegularConvParams} from './conv_benchmarks'; | |
-import {MatmulGPUBenchmark} from './matmul_benchmarks'; | |
import {MobileNetV1GPUBenchmark} from './mobilenet_benchmarks'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/integration_tests/benchmarks/benchmark_test.ts b/integration_tests/benchmarks/benchmark_test.ts | |
index 8148ea2..72b74f7 100644 | |
--- a/integration_tests/benchmarks/benchmark_test.ts | |
+++ b/integration_tests/benchmarks/benchmark_test.ts | |
@@ -15,10 +15,15 @@ | |
* ============================================================================= | |
*/ | |
+import * as tf from '@tensorflow/tfjs-core'; | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/integration_tests/benchmarks/matmul_benchmarks.ts b/integration_tests/benchmarks/matmul_benchmarks.ts | |
index 8f67ed9..5e242fb 100644 | |
--- a/integration_tests/benchmarks/matmul_benchmarks.ts | |
+++ b/integration_tests/benchmarks/matmul_benchmarks.ts | |
@@ -43,8 +43,8 @@ export class MatmulGPUBenchmark implements BenchmarkTest { | |
async run(size: number): Promise<number> { | |
tf.setBackend('webgl'); | |
- const a: tf.Tensor2D = tf.randomNormal([size, size]); | |
- const b: tf.Tensor2D = tf.randomNormal([size, size]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/integration_tests/benchmarks/benchmark_test.ts b/integration_tests/benchmarks/benchmark_test.ts | |
index 8148ea22..e883b11c 100644 | |
--- a/integration_tests/benchmarks/benchmark_test.ts | |
+++ b/integration_tests/benchmarks/benchmark_test.ts | |
@@ -40,9 +40,9 @@ describe('benchmarks', () => { | |
}); | |
it('conv2d', async done => { | |
- const sizes = [10, 100, 227]; | |
+ const sizes = [10, 227, 513]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/integration_tests/benchmarks/benchmark_test.ts b/integration_tests/benchmarks/benchmark_test.ts | |
index 8148ea22..d90a4ca3 100644 | |
--- a/integration_tests/benchmarks/benchmark_test.ts | |
+++ b/integration_tests/benchmarks/benchmark_test.ts | |
@@ -18,6 +18,7 @@ | |
import {ConvGPUBenchmark, RegularConvParams} from './conv_benchmarks'; | |
import {MatmulGPUBenchmark} from './matmul_benchmarks'; | |
import {MobileNetV1GPUBenchmark} from './mobilenet_benchmarks'; | |
+import {TransposeGPUBenchmark} from './transpose_benchmarks'; | |
import * as test_util from './test_util'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/ops/batchnorm_test.ts b/src/ops/batchnorm_test.ts | |
index c8ac335..6bd30e1 100644 | |
--- a/src/ops/batchnorm_test.ts | |
+++ b/src/ops/batchnorm_test.ts | |
@@ -16,8 +16,10 @@ | |
*/ | |
import * as tf from '../index'; | |
-import {describeWithFlags} from '../jasmine_util'; | |
+import {describeWithFlags, TEST_ENVS} from '../jasmine_util'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/integration_tests/benchmarks/benchmark.html b/integration_tests/benchmarks/benchmark.html | |
index 31ecd4e..04fce0a 100644 | |
--- a/integration_tests/benchmarks/benchmark.html | |
+++ b/integration_tests/benchmarks/benchmark.html | |
@@ -112,11 +112,19 @@ | |
<tbody></tbody> | |
</table> | |
</div> | |
+ <script src="../../../tfjs-core/dist/tf-core.js"> </script> | |
+ <script src="../../../tfjs-converter/dist/tf-converter.js"> </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/integration_tests/benchmarks/benchmark.html b/integration_tests/benchmarks/benchmark.html | |
index 31ecd4e..4a1e977 100644 | |
--- a/integration_tests/benchmarks/benchmark.html | |
+++ b/integration_tests/benchmarks/benchmark.html | |
@@ -112,32 +112,42 @@ | |
<tbody></tbody> | |
</table> | |
</div> | |
+ <script src="../../../tfjs-core/dist/tf-core.js"> </script> | |
+ <script src="../../../tfjs-converter/dist/tf-converter.js"> </script> |