Skip to content

Commit 7678d4d

Browse files
authored
Fix CI (#612)
1 parent f61ae1f commit 7678d4d

File tree

7 files changed

+19
-56
lines changed

7 files changed

+19
-56
lines changed

.github/workflows/ci.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,23 @@ jobs:
1515
CI:
1616
runs-on: ${{ matrix.os }}
1717
strategy:
18-
matrix:
19-
julia-version: ["1", "nightly"]
20-
julia-arch: [x64]
21-
os: [macos-latest, ubuntu-latest]
2218
fail-fast: false
19+
matrix:
20+
julia-version:
21+
- "1.5"
22+
- "1"
23+
- "nightly"
24+
arch:
25+
- x64
26+
os:
27+
- macos-latest
28+
- ubuntu-latest
2329
steps:
2430
- uses: actions/checkout@v2
2531
- uses: julia-actions/setup-julia@v1
2632
with:
2733
version: ${{ matrix.julia-version }}
34+
arch: ${{ matrix.arch }}
2835
- if: startsWith(matrix.os, 'ubuntu')
2936
run: |
3037
sudo apt-get update
@@ -33,8 +40,8 @@ jobs:
3340
run: |
3441
brew update
3542
brew install pdf2svg tree
36-
brew cask install basictex
37-
echo "::add-path::/Library/TeX/texbin"
43+
brew install --cask basictex
44+
echo "/Library/TeX/texbin" >> $GITHUB_PATH
3845
- if: startsWith(matrix.os, 'macOS')
3946
run: |
4047
sudo tlmgr update --self || sudo tlmgr update --self || sudo tlmgr update --self
@@ -44,7 +51,7 @@ jobs:
4451
- uses: julia-actions/julia-buildpkg@latest
4552
- uses: julia-actions/julia-runtest@latest
4653
env:
47-
JULIA_DEBUG: "all"
54+
# JULIA_DEBUG: "all"
4855
PREDICTMD_OPEN_PLOTS_DURING_TESTS: "true"
4956
PREDICTMD_TEST_GROUP: "all"
5057
PREDICTMD_TEST_PLOTS: "true"

Project.toml

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ name = "PredictMD"
22
uuid = "3e7d7328-36f8-4388-bd01-4613c92c7370"
33
authors = ["Dilum Aluthge <[email protected]>", "Ishan Sinha <[email protected]>", "Paul Stey <[email protected]>", "Isabel Restrepo <[email protected]>", "Elizabeth Chen <[email protected]>", "Neil Sarkar <[email protected]>", "Brown Center for Biomedical Informatics <[email protected]>"]
44
doi = "10.5281/zenodo.1291209"
5-
version = "0.34.19"
5+
version = "0.34.20"
66

77
[deps]
8-
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
98
BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
109
CSVFiles = "5d742f6a-9f54-50ce-8119-2520741973ca"
11-
CUDAapi = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3"
1210
Cassette = "7057c7e9-c182-5462-911a-8362d720325c"
1311
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
1412
ClassImbalance = "04a18a73-7590-580c-b363-eeca0919eb2a"
@@ -56,10 +54,8 @@ UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
5654
ValueHistories = "98cad3c8-aec3-5f06-8e41-884608649ab7"
5755

5856
[compat]
59-
Adapt = "1"
6057
BSON = "0.2"
6158
CSVFiles = "0.16, 1.0"
62-
CUDAapi = "2, 3, 4"
6359
Cassette = "0.2, 0.3"
6460
CategoricalArrays = "0.7, 0.8"
6561
ClassImbalance = "0.8"
@@ -100,7 +96,7 @@ StatsModels = "0.6"
10096
TikzPictures = "3"
10197
UnicodePlots = "1"
10298
ValueHistories = "0.5"
103-
julia = "1.1"
99+
julia = "1.5"
104100

105101
[extras]
106102
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"

src/toplevel/always-loaded/neuralnetwork/flux.jl

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import Adapt
2-
import CUDAapi
31
# import Flux
42
# import GPUArrays
53
# import NNlib

src/toplevel/always-loaded/neuralnetwork/knet.jl

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import CUDAapi
21
# import GPUArrays
32
import Knet
43
import ProgressMeter

src/toplevel/always-loaded/utils/constant_columns.jl

+3-25
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,4 @@
11
import DataFrames
2-
import StatsBase
3-
4-
function get_countmap(itr; skip_missings::Bool = true)
5-
if skip_missings
6-
result = get_countmap_skip_missings(itr)
7-
else
8-
result = get_countmap_include_missings(itr)
9-
end
10-
return result
11-
end
12-
13-
function get_countmap_skip_missings(itr)
14-
result = StatsBase.countmap(collect(skipmissing(itr)))
15-
return result
16-
end
17-
18-
function get_countmap_include_missings(itr)
19-
result = StatsBase.countmap(collect(itr))
20-
return result
21-
end
222

233
function get_unique_values(itr; skip_missings::Bool = true)
244
if skip_missings
@@ -30,13 +10,11 @@ function get_unique_values(itr; skip_missings::Bool = true)
3010
end
3111

3212
function get_unique_values_skip_missings(itr)
33-
result = keys(get_countmap_skip_missings(itr))
34-
return result
13+
return unique(skipmissing(collect(itr)))
3514
end
3615

37-
function get_unique_values_include_missings(itr)
38-
result = keys(get_countmap_include_missings(itr))
39-
return result
16+
function get_unique_values_include_missings(itr)
17+
return unique(collect(itr))
4018
end
4119

4220
function get_number_of_unique_values(itr; skip_missings::Bool = true)::Int

test/Project.toml

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
[deps]
2-
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
32
BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
43
CSVFiles = "5d742f6a-9f54-50ce-8119-2520741973ca"
5-
CUDAapi = "3895d2a7-ec45-59b8-82bb-cfc6a382f9b3"
64
Cassette = "7057c7e9-c182-5462-911a-8362d720325c"
75
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
86
ClassImbalance = "04a18a73-7590-580c-b363-eeca0919eb2a"

test/unit/toplevel/utils/constant_columns.jl

-13
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@ import Test
44

55
x = Union{Missing, String}["foo", "bar", "foo", missing, "bar"]
66

7-
Test.@test(
8-
length(keys(PredictMD.get_countmap(x; skip_missings = true))) == 2
9-
)
10-
Test.@test(
11-
length(keys(PredictMD.get_countmap(x; skip_missings = false))) == 3
12-
)
13-
Test.@test(
14-
length(keys(PredictMD.get_countmap_skip_missings(x))) == 2
15-
)
16-
Test.@test(
17-
length(keys(PredictMD.get_countmap_include_missings(x))) == 3
18-
)
19-
207
Test.@test(
218
length(PredictMD.get_unique_values(x; skip_missings = true)) == 2
229
)

0 commit comments

Comments
 (0)