AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

checkpoint

Browse source
This commit is contained in:
Stewart Allen 2023-01-09 19:56:58 -05:00
commit 4ec8f845c5
5 changed files with 149 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/kiri-mode/cam/slicer2.js
View file

@ -6,8 +6,6 @@
* Slicing engine used by CAM Topo * Slicing engine used by CAM Topo
*/ */
// dep: moto.broker
// dep: kiri.slice
gapp.register("kiri-mode.cam.slicer2", [], (root, exports) => { gapp.register("kiri-mode.cam.slicer2", [], (root, exports) => {
const { base, kiri } = root; const { base, kiri } = root;
@ -323,74 +321,6 @@ function removeDuplicateLines(lines, debug) {
return output; return output;
} }
moto.broker.subscribe("worker.started", msg => { kiri.topo_slicer = Slicer;
const { dispatch, minions } = msg;
// console.log({ cam_slicer2_worker: dispatch });
kiri.topo_slice = async (widget, resolution) => {
console.log({ topo_slice: widget, resolution });
const vertices = widget.getGeoVertices().toShared();
const range = { min: Infinity, max: -Infinity };
for (let i=0,l=vertices.length; i<l; i += 3) {
const x = vertices[i];
const z = vertices[i + 2];
vertices[i] = z;
vertices[i + 2] = x;
range.min = Math.min(range.min, x);
range.max = Math.max(range.max, x);
}
const shards = Math.ceil(Math.min(25, vertices.length / 27000));
const step = (range.max - range.min) / shards;
const slices = [];
let slice = { min: range.min, max: range.min + step };
for (let z = range.min; z < range.max; z += resolution) {
if (z > slice.max) {
slices.push(slice);
slice = { min: z, max: z + step };
}
}
slices.push(slice);
console.log({ shards, range, step, slices });
// define sharded ranges
if (false && minions.concurrent) {
dispatch.putCache({ key: widget.id, data: vertices }, { done: data => {
console.log({ put_cache_done: data });
}});
dispatch.clearCache({}, { done: data => {
console.log({ clear_cache_done: data });
}});
return [];
} else {
console.time('nuslice');
// iterate over shards, merge output
const output = [];
for (let slice of slices) {
console.log({ slice });
const res = new Slicer()
.setFromArray(vertices, slice)
.slice(resolution)
.map(rec => {
const slice = kiri.newSlice(rec.z);
slice.lines = rec.lines;
for (let line of rec.lines) {
const { p1, p2 } = line;
if (!p1.swapped) { p1.swapXZ(); p1.swapped = true }
if (!p2.swapped) { p2.swapXZ(); p2.swapped = true }
}
return slice;
});
output.appendAll(res);
}
output.sort((a,b) => a.z - b.z);
console.log({ output });
console.timeEnd('nuslice');
return output;
}
};
});
moto.broker.subscribe("minion.started", funcs => {
// console.log({ cam_slicer2_minion: funcs });
});
}); });

135
src/kiri-mode/cam/topo.js
View file

@ -9,7 +9,9 @@
// dep: geo.polygons // dep: geo.polygons
// dep: kiri.slice // dep: kiri.slice
// dep: kiri-mode.cam.driver // dep: kiri-mode.cam.driver
gapp.register("kiri-mode.cam.tools", [], (root, exports) => { // dep: kiri-mode.cam.slicer2
// dep: moto.broker
gapp.register("kiri-mode.cam.topo", [], (root, exports) => {
const { base, kiri } = root; const { base, kiri } = root;
const { driver, newSlice } = kiri; const { driver, newSlice } = kiri;
@ -468,4 +470,135 @@ CAM.Topo = async function(opt) {
return new Topo().generate(opt); return new Topo().generate(opt);
}; };
moto.broker.subscribe("worker.started", msg => {
const { dispatch, minions } = msg;
// console.log({ cam_slicer2_worker: msg });
kiri.topo_slice = async (widget, resolution) => {
console.log({ topo_slice: widget, resolution });
const vertices = widget.getGeoVertices().toShared();
const range = { min: Infinity, max: -Infinity };
// swap XZ in shared array
for (let i=0,l=vertices.length; i<l; i += 3) {
const x = vertices[i];
const z = vertices[i + 2];
vertices[i] = z;
vertices[i + 2] = x;
range.min = Math.min(range.min, x);
range.max = Math.max(range.max, x);
}
const shards = Math.ceil(Math.min(25, vertices.length / 27000));
const step = (range.max - range.min) / shards;
let slices = [];
let slice = { min: range.min, max: range.min + step };
for (let z = range.min; z < range.max; z += resolution) {
if (z > slice.max) {
slices.push(slice);
slice = { min: z, max: z + step };
}
}
slices.push(slice);
console.log({ shards, range, step, slices });
// define sharded ranges
if (minions.running > 1) {
console.time('new topo slice minion');
dispatch.putCache({ key: widget.id, data: vertices }, { done: data => {
// console.log({ put_cache_done: data });
}});
let ps = slices.map(slice => {
return new Promise(resolve => {
minions.queue({
cmd: "topo_slice",
id: widget.id,
resolution,
slice
}, data => {
resolve(data);
});
});
});
slices = (await Promise.all(ps))
.map(rec => rec.res)
.flat()
.sort((a,b) => a[0] - b[0])
.map(rec => {
let slice = kiri.newSlice(rec[0]);
let lines = slice.lines = [];
for (let i=1, l=rec.length; i<l; ) {
lines.push(
base.newLine(
base.newPoint(rec[i++], rec[i++], rec[i++]),
base.newPoint(rec[i++], rec[i++], rec[i++])
)
);
}
return slice;
});
dispatch.clearCache({}, { done: data => {
// console.log({ clear_cache_done: data });
}});
console.timeEnd('new topo slice minion');
return slices;
} else {
console.time('new topo slice');
// iterate over shards, merge output
const output = [];
for (let slice of slices) {
const res = new kiri.topo_slicer()
.setFromArray(vertices, slice)
.slice(resolution)
.map(rec => {
const slice = kiri.newSlice(rec.z);
slice.lines = rec.lines;
for (let line of rec.lines) {
const { p1, p2 } = line;
if (!p1.swapped) { p1.swapXZ(); p1.swapped = true }
if (!p2.swapped) { p2.swapXZ(); p2.swapped = true }
}
return slice;
});
output.appendAll(res);
}
output.sort((a,b) => a.z - b.z);
console.log({ output });
console.timeEnd('new topo slice');
return output;
}
};
});
moto.broker.subscribe("minion.started", msg => {
// console.log({ cam_slicer2_minion: msg });
const { funcs, cache, reply, log } = msg;
funcs.topo_slice = (data, seq) => {
const vertices = cache[data.id];
const res = new kiri.topo_slicer()
.setFromArray(vertices, data.slice)
.slice(data.resolution)
.map(rec => {
const ret = [ rec.z ];
for (let line of rec.lines) {
const { p1, p2 } = line;
if (!p1.swapped) { p1.swapXZ(); p1.swapped = true }
if (!p2.swapped) { p2.swapXZ(); p2.swapped = true }
ret.push(p1.x, p1.y, p1.z);
ret.push(p2.x, p2.y, p2.z);
}
return ret;
});
reply({ seq, res });
};
});
}); });

10
src/kiri-run/minion.js
View file

@ -10,8 +10,8 @@
// dep: geo.wasm // dep: geo.wasm
// dep: kiri.codec // dep: kiri.codec
// dep: kiri-mode.fdm.post // dep: kiri-mode.fdm.post
// dep: kiri-mode.cam.topo
// use: kiri-mode.cam.slicer // use: kiri-mode.cam.slicer
// dep: kiri-mode.cam.slicer2
// dep: ext.clip2 // dep: ext.clip2
gapp.register("kiri-run.minion", [], (root, exports) => { gapp.register("kiri-run.minion", [], (root, exports) => {
@ -142,12 +142,12 @@ const funcs = self.minion = {
putCache: msg => { putCache: msg => {
const { key, data } = msg; const { key, data } = msg;
log({ minion_putCache: key, data }); // log({ minion_putCache: key, data });
if (data) { if (data) {
console.log({ minion_put_cache: key, data }); // console.log({ minion_put_cache: key, data });
cache[key] = data; cache[key] = data;
} else { } else {
console.log({ minion_del_cache: key }); // console.log({ minion_del_cache: key });
delete cache[key]; delete cache[key];
} }
}, },
@ -169,6 +169,6 @@ const funcs = self.minion = {
} }
}; };
moto.broker.publish("minion.started", funcs); moto.broker.publish("minion.started", { funcs, cache, reply, log });
}); });

10
src/kiri-run/worker.js
View file

@ -73,7 +73,13 @@ function minhandler(msg) {
// for concurrent operations // for concurrent operations
const minwork = const minwork =
kiri.minions = { kiri.minions = {
concurrent, get concurrent() {
return concurrent
},
get running() {
return minions.length;
},
start() { start() {
if (minions.length || !concurrent) { if (minions.length || !concurrent) {
@ -625,7 +631,7 @@ kiri.worker = {
putCache(msg, send) { putCache(msg, send) {
const { key, data } = msg; const { key, data } = msg;
console.log({ worker_putCache: key, data }); // console.log({ worker_putCache: key, data });
if (data) { if (data) {
pcache[key] = data; pcache[key] = data;
} else { } else {

2
src/kiri/widget.js
View file

@ -123,7 +123,7 @@ class Widget {
return; return;
} }
const widget = this; const widget = this;
console.log({ saveState: widget.id }); // console.log({ saveState: widget.id });
index().put('ws-save-'+this.id, { index().put('ws-save-'+this.id, {
geo: widget.getGeoVertices({ unroll: false }).slice(), geo: widget.getGeoVertices({ unroll: false }).slice(),
track: widget.track, track: widget.track,