From 35c6fcafabf3ce6086345e45edaea1dd55ab4446 Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Thu, 11 Oct 2018 16:34:34 +0200
Subject: [PATCH] Only include GPU based gaussian code when appropriate
---
src/mol-math/geometry/gaussian-density.ts | 7 ++++++-
src/servers/model/config.ts | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/mol-math/geometry/gaussian-density.ts b/src/mol-math/geometry/gaussian-density.ts
index b05bb1108..16577af6b 100644
--- a/src/mol-math/geometry/gaussian-density.ts
+++ b/src/mol-math/geometry/gaussian-density.ts
@@ -8,9 +8,13 @@ import { Box3D } from '../geometry';
import { Vec3 } from '../linear-algebra';
import { RuntimeContext, Task } from 'mol-task';
import { PositionData, DensityData } from './common';
-import { GaussianDensityGPU } from './gaussian-density/gpu';
import { GaussianDensityCPU } from './gaussian-density/cpu';
+// import { GaussianDensityGPU } from './gaussian-density/gpu';
+const GaussianDensityGPU = typeof document !== 'undefined'
+ ? (require('./gaussian-density/gpu') as typeof import('./gaussian-density/gpu')).GaussianDensityGPU
+ : void 0;
+
export const DefaultGaussianDensityProps = {
resolution: 1,
radiusOffset: 0,
@@ -36,6 +40,7 @@ export function computeGaussianDensity(position: PositionData, box: Box3D, radiu
export async function GaussianDensity(ctx: RuntimeContext, position: PositionData, box: Box3D, radius: (index: number) => number, props: GaussianDensityProps): Promise<DensityData> {
if (props.useGpu) {
+ if (!GaussianDensityGPU) throw 'GPU computation not supported on this platform';
return await GaussianDensityGPU(ctx, position, box, radius, props)
} else {
return await GaussianDensityCPU(ctx, position, box, radius, props)
diff --git a/src/servers/model/config.ts b/src/servers/model/config.ts
index 50869b603..a441e5085 100644
--- a/src/servers/model/config.ts
+++ b/src/servers/model/config.ts
@@ -81,7 +81,7 @@ const config = {
mapFile(source: string, id: string) {
switch (source.toLowerCase()) {
// case 'pdb': return `e:/test/quick/${id}_updated.cif`;
- case 'pdb': return `c:/test/mol-star/model/out/${id}_updated.bcif`;
+ case 'pdb': return `e:/test/mol-star/model/out/${id}_updated.bcif`;
case 'pdb-bcif': return `c:/test/mol-star/model/out/${id}_updated.bcif`;
case 'pdb-cif': return `c:/test/mol-star/model/out/${id}_updated.cif`;
default: return void 0;
--
GitLab