Skip to content

Commit 09d20b5

Browse files
DilumAluthgeDilumAluthge
committed
We need to use JLD2 version 0.1.7 or greater
1 parent 7987993 commit 09d20b5

17 files changed

+121
-242
lines changed

‎Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ GLM = "1"
8383
GZip = "0.5"
8484
HTTP = "0.8"
8585
IterableTables = "1"
86-
JLD2 = "=0.1.2"
86+
JLD2 = "0.1.7"
8787
Knet = "1"
8888
LIBSVM = "0.3"
8989
LaTeXStrings = "1"

‎templates/examples/cpu_examples/boston_housing/src/01_preprocess_data.jl

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
18-
199
# PREDICTMD IF INCLUDE TEST STATEMENTS
2010
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))
2111
if isnothing(logger)

‎templates/examples/cpu_examples/boston_housing/src/02_linear_regression.jl

+2-19
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
18-
199
# PREDICTMD IF INCLUDE TEST STATEMENTS
2010
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))
2111
if isnothing(logger)
@@ -183,9 +173,6 @@ Test.@test(
183173
feature_names,
184174
)
185175
)
186-
Test.@test(
187-
length(PredictMD.linearly_dependent_columns(df)) == 0
188-
)
189176
Test.@test(
190177
length(
191178
PredictMD.linearly_dependent_columns(
@@ -197,10 +184,6 @@ Test.@test(
197184
# PREDICTMD ELSE
198185
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
199186

200-
show(
201-
logger_stream, PredictMD.linearly_dependent_columns(df)
202-
)
203-
204187
show(
205188
logger_stream, PredictMD.linearly_dependent_columns(
206189
training_features_df,

‎templates/examples/cpu_examples/boston_housing/src/03_random_forest_regression.jl

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
18-
199
# PREDICTMD IF INCLUDE TEST STATEMENTS
2010
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))
2111
if isnothing(logger)

‎templates/examples/cpu_examples/boston_housing/src/04_knet_mlp_regression.jl

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
18-
199
# PREDICTMD IF INCLUDE TEST STATEMENTS
2010
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))
2111
if isnothing(logger)

‎templates/examples/cpu_examples/boston_housing/src/05_compare_models.jl

+23-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,32 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
9+
using CSVFiles
10+
using CategoricalArrays
11+
using DataFrames
12+
using DecisionTree
13+
using Distributions
14+
using FileIO
15+
using GLM
16+
using IterTools
17+
using Knet
18+
using LIBSVM
19+
using LinearAlgebra
20+
using PredictMD
21+
using PredictMDAPI
22+
using PredictMDExtra
23+
using RDatasets
24+
using Random
25+
using StatsModels
26+
using Test
27+
using Unitful
28+
29+
const Schema = StatsModels.Schema
1830

1931
# PREDICTMD IF INCLUDE TEST STATEMENTS
2032
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))

‎templates/examples/cpu_examples/boston_housing/src/06_get_model_output.jl

+23-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,32 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
9+
using CSVFiles
10+
using CategoricalArrays
11+
using DataFrames
12+
using DecisionTree
13+
using Distributions
14+
using FileIO
15+
using GLM
16+
using IterTools
17+
using Knet
18+
using LIBSVM
19+
using LinearAlgebra
20+
using PredictMD
21+
using PredictMDAPI
22+
using PredictMDExtra
23+
using RDatasets
24+
using Random
25+
using StatsModels
26+
using Test
27+
using Unitful
28+
29+
const Schema = StatsModels.Schema
1830

1931
# PREDICTMD IF INCLUDE TEST STATEMENTS
2032
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))

‎templates/examples/cpu_examples/breast_cancer_biopsy/src/01_preprocess_data.jl

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
18-
199
# PREDICTMD IF INCLUDE TEST STATEMENTS
2010
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))
2111
if isnothing(logger)

‎templates/examples/cpu_examples/breast_cancer_biopsy/src/02_smote.jl

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
18-
199
# PREDICTMD IF INCLUDE TEST STATEMENTS
2010
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))
2111
if isnothing(logger)

‎templates/examples/cpu_examples/breast_cancer_biopsy/src/03_logistic_classifier.jl

+2-19
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
18-
199
# PREDICTMD IF INCLUDE TEST STATEMENTS
2010
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))
2111
if isnothing(logger)
@@ -215,9 +205,6 @@ Test.@test(
215205
feature_names,
216206
)
217207
)
218-
Test.@test(
219-
length(PredictMD.linearly_dependent_columns(df)) == 0
220-
)
221208
Test.@test(
222209
length(
223210
PredictMD.linearly_dependent_columns(
@@ -229,10 +216,6 @@ Test.@test(
229216
# PREDICTMD ELSE
230217
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
231218

232-
show(
233-
logger_stream, PredictMD.linearly_dependent_columns(df)
234-
)
235-
236219
show(
237220
logger_stream, PredictMD.linearly_dependent_columns(
238221
training_features_df,

‎templates/examples/cpu_examples/breast_cancer_biopsy/src/04_random_forest_classifier.jl

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
18-
199
# PREDICTMD IF INCLUDE TEST STATEMENTS
2010
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))
2111
if isnothing(logger)

‎templates/examples/cpu_examples/breast_cancer_biopsy/src/05_c_svc_svm_classifier.jl

+5-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
18-
199
# PREDICTMD IF INCLUDE TEST STATEMENTS
2010
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))
2111
if isnothing(logger)
@@ -207,6 +197,7 @@ feature_contrasts = PredictMD.generate_feature_contrasts(
207197
feature_names,
208198
)
209199

200+
# PREDICTMD IF INCLUDE TEST STATEMENTS
210201
Test.@test_throws ErrorException PredictMD.single_labelmulticlassdataframesvmclassifier(
211202
feature_names,
212203
single_label_name,
@@ -217,6 +208,8 @@ Test.@test_throws ErrorException PredictMD.single_labelmulticlassdataframesvmcla
217208
verbose = false,
218209
feature_contrasts = feature_contrasts,
219210
)
211+
# PREDICTMD ELSE
212+
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
220213

221214
c_svc_svm_classifier =
222215
PredictMD.single_labelmulticlassdataframesvmclassifier(

‎templates/examples/cpu_examples/breast_cancer_biopsy/src/06_nu_svc_svm_classifier.jl

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
## %PREDICTMD_GENERATED_BY%
22

3-
import PredictMDExtra
3+
using PredictMDExtra
44
PredictMDExtra.import_all()
55

6-
import PredictMD
6+
using PredictMD
77
PredictMD.import_all()
88

9-
# PREDICTMD IF INCLUDE TEST STATEMENTS
10-
import CSVFiles
11-
import DataFrames
12-
import FileIO
13-
import RDatasets
14-
import Random
15-
import Test
16-
# PREDICTMD ELSE
17-
# PREDICTMD ENDIF INCLUDE TEST STATEMENTS
18-
199
# PREDICTMD IF INCLUDE TEST STATEMENTS
2010
logger = Base.CoreLogging.current_logger_for_env(Base.CoreLogging.Debug, Symbol(splitext(basename(something(@__FILE__, "nothing")))[1]), something(@__MODULE__, "nothing"))
2111
if isnothing(logger)

0 commit comments

Comments
 (0)