mac work on train.jl

[?]
AEj8dahVWy718uSSFPe9VSRJ5qX5G8pC2zvFzJJ8yzBd
Mar 3, 2024, 6:29 PM
FY7CEMM2ZSPOL62BX2JR3VBGUTAWEPIJ26AUT4U3GHTWWCAZZY2AC

Dependencies

  • [2] VLYXSYAD added .ignore
  • [3] ETOIK7VE recording changes, but this does not work anymore
  • [4] RBXUHIO2 made somn small changes and reverted them mostly
  • [5] G4IN2F2T
  • [6] EDYR5C55 fixed ConstructPrimaryDataSet, licence date, Readme, re-arranged Predict.jl
  • [7] 3FAESP6N catch up with changes, mainly construct primary dataset
  • [8] BOPNWZL4 refactored Skraak.jl into sub files, tidy now
  • [9] NMQCXLNG catch up commit, about to do some work on prediction loop
  • [10] ZGLDIQ4G rolled back reduced and bifurcated training set used to test models before going away
  • [11] E5JDMNIA added kiwi 1-4 model
  • [12] QPBH7QWC added MLBaste for confusion matrix, f1, roc, must still remove freq tables
  • [13] NV7FXZ5Q first commit
  • [14] E3Y55MPR added perceptual colour maps and changed get_image_from_sample
  • [15] OFTU77S5 first commit
  • [*] AXRC3M3Z

Change contents

  • file deletion: .ignore (----------)
    [4.1][2.18:49](),[2.49][2.1:1]()
    .git
    .DS_Store
  • replacement in src/Train.jl at line 7
    [3.20][4.335676:335751](),[4.335676][4.335676:335751]()
    using CUDA, DataFrames, Dates, Images, Flux, FreqTables, Glob, JLD2, Noise
    [3.20]
    [4.335751]
    using CUDA, Dates, Images, Flux, Glob, JLD2, Noise
  • replacement in src/Train.jl at line 52
    [4.336948][3.82:145]()
    images = glob(glob_pattern) |> shuffle! |> x -> x[1:10000]
    [4.336948]
    [4.337010]
    images = glob(glob_pattern) |> shuffle! |> x -> x[1:640]
  • replacement in src/Train.jl at line 273
    [4.416][3.239:270](),[3.270][4.440:481](),[4.440][4.440:481]()
    r=MLBase.roc(actual, pred)
    return accuracy, confusion_matrix, r
    [4.416]
    [4.343702]
    #roc=MLBase.roc(actual, pred, 100)
    #f1=MLBase.f1score(roc)
    return accuracy, confusion_matrix #, roc, f1
  • replacement in src/Train.jl at line 306
    [4.344368][3.271:330]()
    @time eval, vcm, vroc = evaluate(model, test, classes)
    [4.344368]
    [4.532]
    @time eval, vcm = evaluate(model, test, classes)
  • edit in src/Train.jl at line 309
    [4.618][4.618:691]()
    @info "warm up f1" MLBase.f1score(vroc)
    @info "warm up roc" vroc
  • replacement in src/Train.jl at line 310
    [4.344473][4.344473:344485]()
    a = 0.0
    [4.344473]
    [4.344485]
    a = 0
  • replacement in src/Train.jl at line 316
    [4.344691][3.331:434]()
    @time metric_train, train_confusion_matrix, train_roc = evaluate(model, train_sample, classes)
    [4.344691]
    [4.344774]
    @time train_accuracy, train_confusion_matrix = evaluate(model, train_sample, classes)
  • replacement in src/Train.jl at line 318
    [4.344804][4.344804:344850]()
    @info "train" accuracy = metric_train
    [4.344804]
    [4.344850]
    @info "train" accuracy = train_accuracy
  • edit in src/Train.jl at line 320
    [4.344895][4.787:878]()
    @info "warm up f1" MLBase.f1score(train_roc)
    @info "warm up roc" train_roc
  • replacement in src/Train.jl at line 321
    [4.344896][3.435:527](),[3.527][4.344969:345013](),[4.962][4.344969:345013](),[4.344969][4.344969:345013]()
    @time metric_test, test_confusion_matrix, test_roc = evaluate(model, test, classes)
    @info "test" accuracy = metric_test
    [4.344896]
    [4.345013]
    @time test_accuracy, test_confusion_matrix = evaluate(model, test, classes)
    @info "test" accuracy = test_accuracy
  • edit in src/Train.jl at line 324
    [4.345056][4.963:1082]()
    f_metric = MLBase.f1score(train_roc)
    @info "warm up f1" f_metric
    @info "warm up roc" train_roc
  • replacement in src/Train.jl at line 325
    [4.345057][4.1083:1138]()
    f_metric > a && begin
    a = f_metric
    [4.345057]
    [4.345118]
    # number kiwi guessed right, assumes kiwi=1, not=2 (alphabetical)
    test_confusion_matrix[1,1] > a && begin
    a = test_confusion_matrix[1,1]
  • replacement in src/Train.jl at line 330
    [4.345179][4.345179:345268]()
    "model_$(model_name)_CPU_epoch-$epoch-$metric_test-$(today()).jld2";
    [4.345179]
    [4.345268]
    "model_$(model_name)_CPU_epoch-$epoch-$test_accuracy-$(today()).jld2";
  • edit in Project.toml at line 18
    [4.385929][4.385929:385981]()
    FreqTables = "da1fdf0e-e0ff-5433-a45f-9bb5ff651cb1"
  • replacement in Manifest.toml at line 3
    [4.10259885][4.933:958]()
    julia_version = "1.10.0"
    [4.10259885]
    [4.10259914]
    julia_version = "1.10.2"
  • replacement in Manifest.toml at line 5
    [4.10259938][4.1197:1255]()
    project_hash = "812b8675adee92e263362ac5fdcc45ef3e56ed90"
    [4.10259938]
    [4.1017]
    project_hash = "36ab7335c9993de1817369b06295f91b7a9e9acf"
  • edit in Manifest.toml at line 180
    [4.7304][4.7304:7785]()
    [[deps.CategoricalArrays]]
    deps = ["DataAPI", "Future", "Missings", "Printf", "Requires", "Statistics", "Unicode"]
    git-tree-sha1 = "1568b28f91293458345dabba6a5ea3f183250a61"
    uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597"
    version = "0.10.8"
    [deps.CategoricalArrays.extensions]
    CategoricalArraysJSONExt = "JSON"
    CategoricalArraysRecipesBaseExt = "RecipesBase"
    CategoricalArraysSentinelArraysExt = "SentinelArrays"
    CategoricalArraysStructTypesExt = "StructTypes"
  • edit in Manifest.toml at line 181
    [4.7786][4.7786:8048](),[4.8048][4.10260832:10260833](),[4.10260832][4.10260832:10260833]()
    [deps.CategoricalArrays.weakdeps]
    JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
    RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
    SentinelArrays = "91c51154-3ec4-41a3-a24f-3f23e20d615c"
    StructTypes = "856f2bd8-1eba-4b0a-8007-ebc267875bd4"
  • edit in Manifest.toml at line 238
    [4.10179][4.10179:10325](),[4.10325][4.10261156:10261157](),[4.10261156][4.10261156:10261157]()
    [[deps.Combinatorics]]
    git-tree-sha1 = "08c8b6831dc00bfea825826be0bc8336fc369860"
    uuid = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
    version = "1.0.2"
  • replacement in Manifest.toml at line 257
    [4.10261542][4.10261542:10261562]()
    version = "1.0.5+1"
    [4.10261542]
    [4.10616]
    version = "1.1.0+0"
  • edit in Manifest.toml at line 552
    [4.17296][4.17296:17506]()
    [[deps.FreqTables]]
    deps = ["CategoricalArrays", "Missings", "NamedArrays", "Tables"]
    git-tree-sha1 = "4693424929b4ec7ad703d68912a6ad6eff103cfe"
    uuid = "da1fdf0e-e0ff-5433-a45f-9bb5ff651cb1"
    version = "0.4.6"
  • edit in Manifest.toml at line 1103
    [4.34481][4.34481:34776]()
    [[deps.NamedArrays]]
    deps = ["Combinatorics", "DataStructures", "DelimitedFiles", "InvertedIndices", "LinearAlgebra", "Random", "Requires", "SparseArrays", "Statistics"]
    git-tree-sha1 = "6d42eca6c3a27dc79172d6d947ead136d88751bb"
    uuid = "86f7a689-2022-50b4-a561-43c23ac3c673"
    version = "0.10.0"
  • replacement in Manifest.toml at line 1150
    [4.10273658][4.10273658:10273679]()
    version = "0.3.23+2"
    [4.10273658]
    [4.36008]
    version = "0.3.23+4"
  • edit in .ignore at line 2
    [2.57]
    [2.57]
    .github
  • edit in .ignore at line 4
    [2.67]
    ._*
    Manifest.toml
  • file addition: .gitignore (----------)
    [4.1]
    Manifest.toml
    ._*
    .pijul
    .ignore
  • file addition: .JuliaFormatter.toml (---r------)
    [4.1]
    remove_extra_newlines = true
    format_docstrings = true
    verbose = true
    format_markdown = true
  • file addition: .gitignore (----------)
    [17.1]
    Manifest.toml
    ._*
    .pijul
    .ignore
  • file addition: .JuliaFormatter.toml (---r------)
    [17.1]
    remove_extra_newlines = true
    format_docstrings = true
    verbose = true
    format_markdown = true