Skip to content

Commit 1869130

Browse files
authored
Merge pull request #22 from tjjarvinen/chunks_v3
Bug fix and update ChunkSplitters
2 parents ec4c858 + 1259d80 commit 1869130

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
version:
22-
- '1.9'
2322
- '1.10'
24-
- 'nightly'
23+
- '1'
2524
os:
2625
- ubuntu-latest
2726
arch:

Project.toml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "UltraFastACE"
22
uuid = "8bb720ee-daac-48fb-af73-8a282a9cbbd7"
33
authors = ["Christoph Ortner <christohortner@gmail.com> and contributors"]
4-
version = "0.0.6"
4+
version = "0.0.7"
55

66
[deps]
77
ACE1 = "e3f9bc04-086e-409a-ba78-e9769fe067bb"
@@ -27,11 +27,26 @@ StrideArrays = "d1fa6d79-ef01-42a6-86c9-f7c551f8593b"
2727
WithAlloc = "fb1aa66a-603c-4c1d-9bc4-66947c7b08dd"
2828

2929
[compat]
30-
ChunkSplitters = "2"
30+
ACE1 = "0.12"
31+
ACE1x = "0.1.8"
32+
ACEbase = "0.4"
33+
Bumper = "0.7"
34+
ChunkSplitters = "3"
35+
ChainRules = "1.0"
36+
DynamicPolynomials = "0.6"
37+
Interpolations = "0.14, 0.15"
3138
Folds = "0.2"
39+
JuLIP = "0.16"
40+
LinearAlgebra = "1.9"
3241
NamedTupleTools = "0.14"
42+
Polynomials = "4"
3343
Polynomials4ML = "0.3.0"
34-
julia = "1"
44+
SparseArrays = "1.9"
45+
SpheriCart = "0.1, 0.2"
46+
StaticArrays = "1.5"
47+
StaticPolynomials = "1.3"
48+
StrideArrays = "0.1"
49+
julia = "1.10"
3550
WithAlloc = "0.1.0"
3651

3752

src/julip_calculator.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function forces_new_mt(ace::UFACE, at::Atoms;
103103
executor = ThreadedEx(),
104104
ntasks = Threads.nthreads())
105105
nlist = neighbourlist(at, cutoff(ace))
106-
return Folds.sum( collect(chunks(domain, ntasks)), executor ) do (d, _)
106+
return Folds.sum( collect(chunks(domain; n=ntasks)), executor ) do d
107107
forces_new(ace, at; domain=d, nlist = nlist)
108108
end
109109
end

0 commit comments

Comments
 (0)