Skip to content

abuse more parallelism. #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

abuse more parallelism. #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
497d0de
abuse more parallelism.
julialongtin Jun 9, 2021
9156510
remove warning.
julialongtin Jun 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions programs/extcuraengine.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
-- For matching our OpenScad variable types.
{-# LANGUAGE ViewPatterns #-}

import Prelude ((*), (/), (+), (-), odd, mod, round, floor, foldMap, (<>), FilePath, fromInteger, error, div, reverse, fst, filter, (<=))
import Prelude ((*), (/), (+), (-), odd, mod, round, floor, (<>), FilePath, fromInteger, error, div, reverse, fst, filter, (<=))

import Control.Applicative (pure, (<*>), (<$>))

Expand Down Expand Up @@ -121,13 +121,16 @@ centeredTrisFromSTL (RectArea (bedX,bedY,_)) stl = shiftedTris
where
centerPoint = Point3 (dx,dy,dz)
shiftedTris = [shiftTri centerPoint tri | tri <- tris] `using` parListChunk (div (length tris) (fromFastℕ threads)) rseq
xs = [ xOf.fst <$> triPoints | triPoints <- sidesOf <$> tris ] `using` parListChunk (div (length tris) (fromFastℕ threads)) rseq
ys = [ yOf.fst <$> triPoints | triPoints <- sidesOf <$> tris ] `using` parListChunk (div (length tris) (fromFastℕ threads)) rseq
zs = [ zOf.fst <$> triPoints | triPoints <- sidesOf <$> tris ] `using` parListChunk (div (length tris) (fromFastℕ threads)) rseq
Copy link
Member

@sorki sorki Jun 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lots of repetition here, maybe refactor common parListChunk (div (length tris) (fromFastℕ threads)) rseq.

tris = trianglesFromSTL threads stl
(dx,dy,dz) = (bedX/2-x0, bedY/2-y0, -zMin)
xMin = minimum $ xOf.fst <$> foldMap sidesOf tris
yMin = minimum $ yOf.fst <$> foldMap sidesOf tris
zMin = minimum $ zOf.fst <$> foldMap sidesOf tris
xMax = maximum $ xOf.fst <$> foldMap sidesOf tris
yMax = maximum $ yOf.fst <$> foldMap sidesOf tris
xMin = minimum $ concat xs
xMax = maximum $ concat xs
yMin = minimum $ concat ys
yMax = maximum $ concat ys
zMin = minimum $ concat zs
(x0,y0) = ((xMax+xMin)/2-xMin, (yMax+yMin)/2-yMin)

-----------------------------------------------------------------------
Expand Down