Skip to content

Commit eac4ab8

Browse files
committed
x86 compatibility
1 parent 81bcf23 commit eac4ab8

5 files changed

Lines changed: 84 additions & 8 deletions

File tree

.github/workflows/ci_x86.yml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: CI_X86
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- master
9+
jobs:
10+
SequentialTests:
11+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
12+
runs-on: ${{ matrix.os }}
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
version:
17+
- '1.9'
18+
os:
19+
- ubuntu-latest
20+
arch:
21+
- x86
22+
steps:
23+
- uses: actions/checkout@v2
24+
- uses: julia-actions/setup-julia@v1
25+
with:
26+
version: ${{ matrix.version }}
27+
arch: ${{ matrix.arch }}
28+
- uses: actions/cache@v1
29+
env:
30+
cache-name: cache-artifacts
31+
with:
32+
path: ~/.julia/artifacts
33+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
34+
restore-keys: |
35+
${{ runner.os }}-test-${{ env.cache-name }}-
36+
${{ runner.os }}-test-
37+
${{ runner.os }}-
38+
- uses: julia-actions/julia-buildpkg@v1
39+
- run: julia --project=. -e 'using Pkg; Pkg.instantiate()'
40+
- run: julia --project=. --color=yes --check-bounds=yes test/sequential/runtests.jl
41+
MPITests:
42+
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
43+
runs-on: ${{ matrix.os }}
44+
strategy:
45+
fail-fast: false
46+
matrix:
47+
version:
48+
- '1.9'
49+
os:
50+
- ubuntu-latest
51+
arch:
52+
- x86
53+
steps:
54+
- uses: actions/checkout@v2
55+
- uses: actions/cache@v1
56+
env:
57+
cache-name: cache-artifacts
58+
with:
59+
path: ~/.julia/artifacts
60+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
61+
restore-keys: |
62+
${{ runner.os }}-test-${{ env.cache-name }}-
63+
${{ runner.os }}-test-
64+
${{ runner.os }}-
65+
- uses: julia-actions/setup-julia@v1
66+
with:
67+
version: ${{ matrix.version }}
68+
arch: ${{ matrix.arch }}
69+
#- uses: julia-actions/julia-buildpkg@v1
70+
- run: |
71+
julia --project=test/TestApp/ -e '
72+
using Pkg
73+
Pkg.develop(PackageSpec(path=pwd()))
74+
Pkg.instantiate()'
75+
- run: cd test/TestApp/compile; ./compile.sh
76+
- run: julia --project=test/TestApp/ --color=yes --check-bounds=yes test/mpi/runtests.jl test/TestApp/compile/TestApp.so

src/Algebra.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ function _setup_prange_without_ghosts(dofs_gids_prange::PRange)
11581158
indices = map(partition(dofs_gids_prange)) do dofs_indices
11591159
owner = part_id(dofs_indices)
11601160
own_indices = OwnIndices(ngdofs,owner,own_to_global(dofs_indices))
1161-
ghost_indices = GhostIndices(ngdofs,Int64[],Int32[])
1161+
ghost_indices = GhostIndices(ngdofs,Int[],Int32[])
11621162
OwnAndGhostIndices(own_indices,ghost_indices)
11631163
end
11641164
return PRange(indices)
@@ -1197,8 +1197,8 @@ function _setup_prange_with_ghosts(dofs_gids_prange::PRange,gids,owners)
11971197
gids_ghost_to_global, gids_ghost_to_owner = map(
11981198
gids,owners,dofs_gids_partition) do gids, owners, indices
11991199
ghost_touched = Dict{Int,Bool}()
1200-
ghost_to_global = Int64[]
1201-
ghost_to_owner = Int64[]
1200+
ghost_to_global = Int[]
1201+
ghost_to_owner = Int[]
12021202
me = part_id(indices)
12031203
for (j,jo) in zip(gids,owners)
12041204
if jo != me

test/AdaptivityMultiFieldTests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function DistributedAdaptivityGlue(serial_glue,parent,child)
3333
new_l2g = local_to_global(child_gids)
3434

3535
n2o_cell_map = lazy_map(Reindex(old_g2l),serial_glue.n2o_faces_map[3][new_l2g])
36-
n2o_faces_map = [Int64[],Int64[],collect(n2o_cell_map)]
36+
n2o_faces_map = [Int[],Int[],collect(n2o_cell_map)]
3737
n2o_cell_to_child_id = serial_glue.n2o_cell_to_child_id[new_l2g]
3838
rrules = serial_glue.refinement_rules[old_l2g]
3939
AdaptivityGlue(n2o_faces_map,n2o_cell_to_child_id,rrules)
@@ -224,4 +224,4 @@ function main(distribute)
224224
return
225225
end
226226

227-
end # module AdaptivityMultiFieldTests
227+
end # module AdaptivityMultiFieldTests

test/AdaptivityTests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function DistributedAdaptivityGlue(serial_glue,parent,child)
3333
new_l2g = local_to_global(child_gids)
3434

3535
n2o_cell_map = lazy_map(Reindex(old_g2l),serial_glue.n2o_faces_map[3][new_l2g])
36-
n2o_faces_map = [Int64[],Int64[],collect(n2o_cell_map)]
36+
n2o_faces_map = [Int[],Int[],collect(n2o_cell_map)]
3737
n2o_cell_to_child_id = serial_glue.n2o_cell_to_child_id[new_l2g]
3838
rrules = serial_glue.refinement_rules[old_l2g]
3939
AdaptivityGlue(n2o_faces_map,n2o_cell_to_child_id,rrules)
@@ -231,4 +231,4 @@ function main(distribute)
231231
return
232232
end
233233

234-
end # module AdaptivityTests
234+
end # module AdaptivityTests

test/BlockPartitionedArraysTests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ copy!(x,v)
9999
LinearAlgebra.fillstored!(__m,1.0)
100100

101101
__v = BlockPVector{Vector{Float64}}(undef,block_range)
102-
#__m = BlockPMatrix{SparseMatrixCSC{Float64,Int64}}(undef,block_range,block_range)
102+
#__m = BlockPMatrix{SparseMatrixCSC{Float64,Int}}(undef,block_range,block_range)
103103

104104
maximum(abs,v)
105105
minimum(abs,v)

0 commit comments

Comments
 (0)