changes threads

Author: Maximilian Reißmann

Project.toml

@@ -1,7 +1,7 @@
 name = "GeneExpressionProgramming"
 uuid = "2f0a5bb0-5f4f-4f7f-b515-93a1e67611af"
-authors = ["Max Reissmann <reissmannm@student.unimelb.edu.au>"]
 version = "0.5.1"
+authors = ["Max Reissmann <reissmannm@student.unimelb.edu.au>"]
 
 [deps]
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
@@ -37,6 +37,7 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 Tensors = "48a634ad-e948-5137-8d70-aa71f2a747f4"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+ThreadsX = "ac1d9e8a-700a-412c-b207-f0111f4b6c0d"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 [compat]
@@ -72,5 +73,6 @@ Statistics = "1"
 StatsBase = "0.34 - 0.37"
 Tensors = "1"
 Test = "1"
+ThreadsX = "0.1"
 Zygote = "0.6"
 julia = "1"

src/Gep.jl

@@ -81,6 +81,7 @@ using Printf
 using LRUCache
 using Base.Threads: SpinLock
 using .Threads
+using ThreadsX
 export runGep
 
 
@@ -213,7 +214,7 @@ Applies correction operations to ensure dimensional homogeneity in chromosomes.
 
     if !isnothing(correction_callback) && epoch % correction_epochs == 0
         pop_amount = Int(ceil(length(population) * correction_amount))
-        Threads.@threads for i in 1:pop_amount
+	ThreadsX.foreach(1:pop_amount) do i
             if !(population[i].dimension_homogene) && population[i].compiled && isnan(mean(population[i].fitness))
                 distance, correction = correction_callback(population[i].genes, population[i].toolbox.gen_start_indices,
                     population[i].expression_raw, epoch)
@@ -315,7 +316,7 @@ The evolution process stops when either:
         same = Atomic{Int}(0)
         perform_correction_callback!(population[1:population_size], epoch, correction_epochs, correction_amount, correction_callback)
 
-        Threads.@threads for i in eachindex(population[1:population_size])
+        ThreadsX.foreach(eachindex(population[1:population_size])) do i
             if isnan(mean(population[i].fitness))
                 key = join(population[i].expression_raw, ",")
                 cache_value = key in keys(fit_cache)

src/RegressionWrapper.jl

@@ -473,7 +473,7 @@ mutable struct GepRegressor
     function GepRegressor(feature_amount::Int;
         entered_features::Vector{Symbol}=Vector{Symbol}(),
         entered_non_terminals::Vector{Symbol}=[:+, :-, :*, :/],
-        entered_terminal_nums::Vector{Symbol}=[Symbol(0.0), Symbol(0.5)],
+        entered_terminal_nums::Vector{Symbol}=[Symbol(0.5),Symbol(0.0)],
         gene_connections::Vector{Symbol}=[:+, :-, :*, :/],
         considered_dimensions::Dict{Symbol,Vector{Float16}}=Dict{Symbol,Vector{Float16}}(),
         rnd_count::Int=1,

src/Sbp.jl

@@ -881,9 +881,9 @@ function create_lib(tokenLib::TokenLib, features::Vector{Int8},
         end
 
         lib_array = collect(lib)
-        Threads.@threads for i in eachindex(lib_array)
+        Threads.@threads :static for i in eachindex(lib_array)
             entry = lib_array[i]
-            local_entries = new_entries_local[Threads.threadid()]
+            local_entries = new_entries_local[mod1(Threads.threadid(), Threads.nthreads())]
             for item in search_space
                 new_entry = copy(entry)
                 append!(new_entry, item)
@@ -917,11 +917,11 @@ function reorganize_lib(old_lib::Set{LibEntry})
     local_libs = [OrderedDict{Tuple{Vector{Float16},Int},Vector{Vector{Int8}}}() for _ in 1:Threads.nthreads()]
 
     old_lib_array = collect(old_lib)  # Convert Set to Array
-    Threads.@threads for i in eachindex(old_lib_array)
+    Threads.@threads :static for i in eachindex(old_lib_array)
         entry = old_lib_array[i]
         clean!(entry)
         key = (entry.physical_dimension, length(entry.elements))
-        local_lib = local_libs[Threads.threadid()]
+        local_lib = local_libs[mod1(Threads.threadid(), Threads.nthreads())]
 
         if haskey(local_lib, key)
             push!(local_lib[key], entry.elements)
@@ -1174,7 +1174,7 @@ function calculate_contribution(tree::TempComputeTree, expected_dim::Vector{Floa
 end
 
 function check_crit_up!(len_rest::Int, expected_dim::Vector{Float16}, tree::TempComputeTree)
-    @inbounds for elem in len_rest:-1:SMALLEST_TREE_SEGMENT
+    @inbounds for elem in len_rest:-1:max(SMALLEST_TREE_SEGMENT,len_rest-SMALLEST_TREE_SEGMENT*2)
         if haskey(tree.tokenDto.lib[], (expected_dim, elem))
             tree.exchange_len = elem
             return true
@@ -1448,7 +1448,7 @@ function propagate_necessary_changes!(
         return true
     end
 
-    if check_crit_up!(tree.depend_on_total_number + 1, expected_dim, tree) && distance_to_change <= 0 && rand() > 0.01
+    if check_crit_up!(tree.depend_on_total_number + 1, expected_dim, tree) && distance_to_change <= 0 && rand() > 0.05
         return enforce_changes!(tree, expected_dim)
     end