Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master to be -> master #13

Merged
merged 233 commits into from
Apr 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
233 commits
Select commit Hold shift + click to select a range
23692e5
projectors in factor graph are 1-dimensional
annamariadziubyna Sep 8, 2021
551e0d1
clean up
annamariadziubyna Sep 9, 2021
772595f
new way of loading J and states
annamariadziubyna Oct 18, 2021
85ddacc
clean up
annamariadziubyna Oct 18, 2021
3529b97
add ! in decode_projector
annamariadziubyna Oct 20, 2021
87c574f
clean up
annamariadziubyna Oct 20, 2021
788e996
forma and clean up code
bartekGardas Nov 19, 2021
4c518db
clean up more
bartekGardas Nov 19, 2021
89885c1
formate code
bartekGardas Nov 19, 2021
46c8e30
clean up
bartekGardas Dec 2, 2021
26e1865
add test full_pegasus
annamariadziubyna Dec 3, 2021
fed72d3
brodcast all_states
bartekGardas Dec 3, 2021
e48c3e6
Merge branch 'projectors' of github.com:euro-hpc-pl/SpinGlassNetworks…
bartekGardas Dec 3, 2021
e52b042
add instances and example for Lukasz
bartekGardas Dec 3, 2021
5f2841e
add benchmarks
bartekGardas Dec 3, 2021
1a608b8
correct a type
bartekGardas Dec 3, 2021
d915c2c
clean up
bartekGardas Dec 3, 2021
4a8d876
correct typo
bartekGardas Dec 3, 2021
80ac202
simplify spectrum.jl
bartekGardas Dec 3, 2021
1355ae3
remove decode_projector
annamariadziubyna Dec 3, 2021
18e017f
threaded spectrum works
bartekGardas Dec 4, 2021
ab2c9db
clean up
bartekGardas Dec 4, 2021
8168283
Merge branch 'projectors' of github.com:euro-hpc-pl/SpinGlassNetworks…
bartekGardas Dec 4, 2021
fc028fe
clean up
bartekGardas Dec 4, 2021
838fef5
add rudementary gpu brute force
lpawela Dec 4, 2021
d4f3bc0
clen up
bartekGardas Dec 4, 2021
8979588
Merge branch 'projectors' of github.com:euro-hpc-pl/SpinGlassNetworks…
bartekGardas Dec 4, 2021
30ab077
rm commented functions
bartekGardas Dec 4, 2021
73d38e9
fix binary conversion
lpawela Dec 4, 2021
cdf96b7
Merge branch 'projectors' of github.com:iitis/SpinGlassNetworks.jl in…
lpawela Dec 4, 2021
2b94987
add sortperm (requires cuda from master)
lpawela Dec 4, 2021
370f370
compare energies
bartekGardas Dec 4, 2021
833f3de
Merge branch 'projectors' of github.com:euro-hpc-pl/SpinGlassNetworks…
bartekGardas Dec 4, 2021
fc8a82a
add my_digits
bartekGardas Dec 5, 2021
9d6e9d2
add new kernel (still does not work, but close)
bartekGardas Dec 5, 2021
9291cc3
something works
bartekGardas Dec 5, 2021
fc8eb28
fix bits
bartekGardas Dec 5, 2021
510840e
should work but it does not
bartekGardas Dec 5, 2021
c6c5c47
gnoj
bartekGardas Dec 5, 2021
9e4c86b
fix indexing
bartekGardas Dec 5, 2021
7b06365
improve stuff a bit but still :(
bartekGardas Dec 5, 2021
041ef76
almost there
bartekGardas Dec 5, 2021
405af9e
fix issues with Spectrum
bartekGardas Dec 5, 2021
df6c0d4
works
bartekGardas Dec 5, 2021
c842f28
check all states
bartekGardas Dec 5, 2021
47787d0
all work
bartekGardas Dec 5, 2021
0d7b5c1
clean up
bartekGardas Dec 5, 2021
0d64212
add more control over CUDA lauch
bartekGardas Dec 5, 2021
5ebfd6a
all tests pass
bartekGardas Dec 5, 2021
0836080
add specializiation for brute_force devices
lpawela Dec 6, 2021
47e9c22
clean up
bartekGardas Dec 6, 2021
cd3fab9
clean up
bartekGardas Dec 7, 2021
e8b12a2
clean up energy mess
bartekGardas Dec 7, 2021
b176c42
clean up tests
bartekGardas Dec 7, 2021
fe15645
clean up 2
bartekGardas Dec 7, 2021
668b4c9
clean up benchmarks
bartekGardas Dec 7, 2021
b4ab708
clean factor.jl
bartekGardas Dec 7, 2021
73cfe5c
introducing Pegasus geometry
marekrams Dec 9, 2021
7a5f65a
clean up pegasus_lattice
bartekGardas Dec 9, 2021
2622b89
towards new pegasus geometry
marekrams Dec 10, 2021
b3ecd0b
new indexing of pegasus lattice
marekrams Dec 21, 2021
2efd070
clean up
bartekGardas Dec 21, 2021
e8a86e0
add energy
bartekGardas Dec 23, 2021
d540ece
fix up
bartekGardas Dec 23, 2021
b12f361
energy in factor
marekrams Dec 23, 2021
2587379
fix energy
bartekGardas Dec 23, 2021
889e9f2
clean up
bartekGardas Dec 23, 2021
b17b9f7
clean up
bartekGardas Dec 23, 2021
7ff9d00
add comment
bartekGardas Dec 23, 2021
abe2c36
fix
bartekGardas Dec 23, 2021
72b54df
ecv
bartekGardas Dec 23, 2021
3ad8684
energy fg to fix
marekrams Dec 23, 2021
068000e
Merge branch 'projectors' of github.com:euro-hpc-pl/SpinGlassNetworks…
bartekGardas Dec 23, 2021
dcff7ca
add energy for factor graph
bartekGardas Dec 23, 2021
526edad
add energy
bartekGardas Dec 23, 2021
bdb082c
add energy
bartekGardas Dec 23, 2021
64552e1
Merge branch 'projectors' of github.com:euro-hpc-pl/SpinGlassNetworks…
bartekGardas Dec 23, 2021
6bbdba5
fix energy
bartekGardas Dec 23, 2021
787fe3c
add changes for 1.7
bartekGardas Jan 11, 2022
48126ac
add energy from factor graph
annamariadziubyna Jan 19, 2022
d8b3083
clean up energy
bartekGardas Jan 19, 2022
c322836
energy works
annamariadziubyna Jan 19, 2022
2723413
cleam up
bartekGardas Jan 19, 2022
71f0da5
Merge branch 'projectors' of github.com:euro-hpc-pl/SpinGlassNetworks…
bartekGardas Jan 19, 2022
b35a373
clean up
bartekGardas Jan 19, 2022
b72d748
simplify energy for fg
bartekGardas Jan 19, 2022
d416026
clean up energy
bartekGardas Jan 19, 2022
074f45a
energy
annamariadziubyna Jan 20, 2022
83f47f9
fix energy for fg
bartekGardas Jan 20, 2022
4d1c2b4
Merge branch 'projectors' of github.com:euro-hpc-pl/SpinGlassNetworks…
bartekGardas Jan 20, 2022
bf443cd
clear types and add cluster_size for fg
bartekGardas Jan 25, 2022
47dd623
test
bartekGardas Jan 27, 2022
1105220
start documenting code
annamariadziubyna Feb 10, 2022
7bcb4eb
start commenting code
bartekGardas Feb 10, 2022
d7a06a7
fixing pegasus conventions
marekrams Jun 9, 2022
525d242
begin writing tests for numbering functions
tomsmierz Jun 14, 2022
a23bc62
Merge branch 'proj' of https://github.com/euro-hpc-pl/SpinGlassNetwor…
tomsmierz Jun 14, 2022
99e1d6a
begun rewriting code wrom python
tomsmierz Jun 14, 2022
d2d0810
tests for written functions
tomsmierz Jun 14, 2022
dd8c976
all main functions for numerate
tomsmierz Jun 15, 2022
4229e88
add ref
bartekGardas Jun 15, 2022
993cca8
clean up
bartekGardas Jun 15, 2022
ee62686
clean up
bartekGardas Jun 21, 2022
1e93bdc
add pegasus_lattice_masoud
annamariadziubyna Jun 29, 2022
2c3d626
add pegasus_lattice_tomek
annamariadziubyna Jun 30, 2022
4d70c3e
early work on zephyr lattice
tomsmierz Jul 1, 2022
5be4fcf
zephyr lattice (Z1)
tomsmierz Jul 5, 2022
34b75a0
started work on zephyr lattice boundary
tomsmierz Jul 7, 2022
ecc343b
clean up Z1
annamariadziubyna Jul 7, 2022
3683651
horizontal spins in zephyr
tomsmierz Jul 11, 2022
4eda736
zephyr_to_linear, linear_to_zephy
tomsmierz Jul 12, 2022
0a21d70
started work on lattice_5_tuple
tomsmierz Jul 12, 2022
fac1077
zephyr lattice Z2 square
annamariadziubyna Jul 14, 2022
4a98da6
fix bug
annamariadziubyna Jul 14, 2022
ee3e168
zephyr lattice rotated works for z1 and z2
annamariadziubyna Jul 14, 2022
3711b81
clean up
annamariadziubyna Jul 14, 2022
96fecc5
add empty clusters in zephyr
annamariadziubyna Oct 11, 2022
ea5a683
add zephyr lattice
annamariadziubyna Jan 12, 2023
421620e
idea projectors
marekrams Jan 25, 2023
df61bac
aa
marekrams Jan 25, 2023
6446f51
correct syntax
bartekGardas Jan 25, 2023
2893fa4
add comments
bartekGardas Jan 25, 2023
cb25079
add periodic lattice (PBCs)
annamariadziubyna Feb 2, 2023
768fbc8
pool of projectors
marekrams Feb 3, 2023
aad83de
fg
marekrams Feb 3, 2023
624aa01
energy
marekrams Feb 3, 2023
25c580f
decode states in sampling
annamariadziubyna Feb 3, 2023
1fd6d7c
lp size
marekrams Feb 4, 2023
0bbbf19
remove PoolOfProjectors
marekrams Feb 8, 2023
041435c
no CUDA
marekrams Feb 8, 2023
d871d72
removed unnecessary functions
tomsmierz Feb 13, 2023
7d43d64
start working on a proper types propagation
bartekGardas Feb 25, 2023
1c016c8
clean up tests
bartekGardas Feb 25, 2023
0a0b3aa
restor tests
bartekGardas Feb 25, 2023
c602bed
fix a bug
bartekGardas Feb 25, 2023
d7fd942
clean up - all test pass
bartekGardas Feb 25, 2023
807a6f2
add more tests
bartekGardas Feb 25, 2023
b860068
rearange code a bit
bartekGardas Feb 25, 2023
1adc7a2
final clean up
bartekGardas Feb 25, 2023
e8f5882
add truncated factor graph
annamariadziubyna May 12, 2023
8c120d3
truncate factor graph another method
annamariadziubyna May 17, 2023
e785fcc
fix bug in truncate_factor_graph
marekrams May 19, 2023
75c6475
fix export truncate_factor_graph
marekrams May 19, 2023
b8c0c03
truncate_factor_graph partialsortperm
marekrams May 19, 2023
05945cf
precise truncate
marekrams Jun 2, 2023
dadd178
fix truncate factor
marekrams Jun 2, 2023
e1d14b1
repaired test of renumerations
tomsmierz Jun 16, 2023
89fc0c3
Truncate factor graph based on belief propagation
annamariadziubyna Jul 3, 2023
eaa7b88
Merge branch 'proj' of https://github.com/euro-hpc-pl/SpinGlassNetwor…
annamariadziubyna Jul 3, 2023
5b87520
iterations as a parameter in BP
annamariadziubyna Jul 3, 2023
0862725
remove println
annamariadziubyna Jul 3, 2023
fba84ad
clean belief propagation
annamariadziubyna Jul 7, 2023
9da752d
clean up BP
annamariadziubyna Jul 7, 2023
ffcb14c
belief propagation
annamariadziubyna Jul 7, 2023
58d02fb
remove println
annamariadziubyna Jul 7, 2023
7a0d5d3
BP tests
annamariadziubyna Jul 7, 2023
6093ff7
truncate_factor_graph_2site_BP
annamariadziubyna Jul 7, 2023
bc31b21
fix the bug in BP
annamariadziubyna Jul 17, 2023
2a66ff7
new BP
annamariadziubyna Jul 18, 2023
c1585d3
BP 2-site
annamariadziubyna Jul 20, 2023
b4ce768
rewrite update message, add tests
annamariadziubyna Jul 20, 2023
592037d
bp (pathological not working)
marekrams Jul 21, 2023
cb8b39e
bp example
annamariadziubyna Jul 21, 2023
af7de38
Merge branch 'proj' of https://github.com/euro-hpc-pl/SpinGlassNetwor…
annamariadziubyna Jul 21, 2023
93c8d6d
cleaning
marekrams Jul 21, 2023
de5fa92
clean bp
marekrams Jul 21, 2023
ed152c8
updatemessage
marekrams Jul 21, 2023
8aca68e
sparse
marekrams Jul 21, 2023
e5bbe62
bp
marekrams Jul 24, 2023
3652a90
separate truncation and BP
annamariadziubyna Aug 9, 2023
e9b2a8f
rm tol
annamariadziubyna Aug 9, 2023
e67c164
truncate fg for zephyr
annamariadziubyna Aug 16, 2023
42fe630
comment projectors
marekrams Aug 18, 2023
1982ba1
states_int in Spectrum
annamariadziubyna Aug 23, 2023
66bbc54
fix the bug in Spectrum, all tests pass
annamariadziubyna Aug 25, 2023
f3725a4
change types in matrix_to_integers
annamariadziubyna Aug 25, 2023
a2de583
rename factor_graph to clustered_hamiltonian
annamariadziubyna Sep 16, 2023
8ec1276
add bond energy
annamariadziubyna Sep 19, 2023
1bd2552
try to move PoolOfProjectors
annamariadziubyna Sep 19, 2023
a3d865b
add CUDA
annamariadziubyna Sep 20, 2023
5ace384
try to remove :pl, :pr
annamariadziubyna Sep 20, 2023
39a095f
PoolOfProjectors in clustered_hamiltonian
annamariadziubyna Sep 20, 2023
ea1e1d6
add tests on projectors
annamariadziubyna Sep 20, 2023
19b1545
final cleaning projectors
annamariadziubyna Sep 20, 2023
ceff03a
Merge remote-tracking branch 'origin/types' into master_types
annamariadziubyna Sep 21, 2023
d225be4
add types
annamariadziubyna Sep 22, 2023
12877c3
splitting overly long lines
annamariadziubyna Sep 23, 2023
e46d1bc
exception in states_int
annamariadziubyna Sep 25, 2023
1446790
add docs
annamariadziubyna Sep 27, 2023
69fedcf
docs
annamariadziubyna Sep 28, 2023
1614f46
add docstrings
annamariadziubyna Oct 2, 2023
425a4be
add $(TYPEDSIGNATURES)
annamariadziubyna Oct 3, 2023
6e69a70
split the lines
annamariadziubyna Oct 5, 2023
b984522
corrected the function names
tomsmierz Oct 13, 2023
0e420f4
clean up toml
bartekGardas Oct 27, 2023
9a0577a
added function for loading openGM images
tomsmierz Nov 15, 2023
c6030cd
WIP rmf
tomsmierz Nov 16, 2023
4008b7b
add the docs
annamariadziubyna Nov 17, 2023
caded78
rmf clustered hamiltonian v1.0
tomsmierz Nov 17, 2023
2c37b7b
add the docs
annamariadziubyna Nov 19, 2023
7290d96
bugfix
tomsmierz Nov 21, 2023
f54b926
fix the bug in RMF clustered hamiltonian
annamariadziubyna Nov 21, 2023
653ccd9
clean up cluster hamiltonian for RMF
annamariadziubyna Nov 21, 2023
5987b75
change cl_h spectrum
annamariadziubyna Nov 22, 2023
2ab5ce1
added sizes for benchmark instances and
tomsmierz Nov 22, 2023
a1aaf23
fix the bug in reading h5 instances
annamariadziubyna Nov 22, 2023
0eb5aac
add docs
annamariadziubyna Nov 23, 2023
d7311b4
add the docs
annamariadziubyna Nov 27, 2023
dc80211
add png images
annamariadziubyna Dec 19, 2023
003035c
moved projectors.jl to SpinGlassTensors
tomsmierz Dec 20, 2023
12b8213
moved tests
tomsmierz Dec 20, 2023
6204281
git push
lpawela Dec 20, 2023
1c4e41d
added SpinGlassTensors to dependencies
tomsmierz Dec 20, 2023
d0860f2
removed projectors.jl
tomsmierz Dec 20, 2023
11fdaab
Merge branch 'master_to_be' of https://github.com/euro-hpc-pl/SpinGla…
tomsmierz Dec 20, 2023
90b2b4c
changed version to 1.0
tomsmierz Dec 20, 2023
077dc0b
moved rank_reveal to SpinGlassTensors
tomsmierz Dec 21, 2023
e3d7148
save BP results to file
annamariadziubyna Jan 19, 2024
6b38307
rewrite truncate_hamiltonian_2site_BP
annamariadziubyna Jan 23, 2024
cfff407
clean up
annamariadziubyna Jan 25, 2024
9f3df85
correct test
annamariadziubyna Feb 4, 2024
11e45d4
fix versions, switch to Graphs from LightGraphs
lpawela Mar 6, 2024
3de25f7
reformat
lpawela Mar 6, 2024
c02c759
fix ci, make
lpawela Mar 29, 2024
664a1bb
update CI workflow
lpawela Apr 9, 2024
f8470a6
remove tensor cast
lpawela Apr 9, 2024
21086ff
add push run
lpawela Apr 9, 2024
516dabb
fix test
lpawela Apr 9, 2024
6a1e54c
update readme
lpawela Apr 9, 2024
330ebbd
move benchmarks to other repo
lpawela Apr 9, 2024
b7220f0
Merge branch 'master' into master_to_be
lpawela Apr 9, 2024
fd4b6b5
fix test
lpawela Apr 9, 2024
f1d2dff
update compat
lpawela Apr 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
correct syntax
  • Loading branch information
bartekGardas committed Jan 25, 2023
commit 6446f5193c777adbb58171b4e939755da61b2427
39 changes: 13 additions & 26 deletions src/idea_projectors.jl
Original file line number Diff line number Diff line change
@@ -1,36 +1,23 @@


Proj = Union{Vector{Int64}, Cuarray{Int64, 1}}
export
PoolOfProjectors

const Proj{T} = Union{Vector{T}, CuArray{T, 1}}

struct list_of_projectors
default_decive = CPU
data :: Dict{devices, Dict{Int64, Proj}} # kazdy klucz ma element na cpu
## jak kontrolowac czy okiekt na gpu czy na cpu?
# osobne miejsce
struct PoolOfProjectors{T}
data::Dict{Symbol, Dict{Int, Proj{T}}}
default_device::Symbol

length(lp::list_of_projectors, index::Int64) = length(lp.data[lp.default_device][index])


function clear_memory(lp, device)

function get_projector(lp :: list_of_projectors, index::Proj_keys, device::Int64; view::Symbol = :1D)
# sprawdz czy index in lp.data[device]; jesli nie to go dodaj biorac dane z lp.data[default_device]
return lp.data[device][index] # dodac element do dataGPU jak jest na cpu, ale nie na gpu ???
PoolOfProjectors(data:::Dict{Int, Dict{Int, Vector{T}}}) where T = new{T}(data, :CPU)
end

Base.eltype(lp::PoolOfProjectors{T}) where T = T
Base.length(lp::PoolOfProjectors, index::Int) = length(lp.data[lp.default_device][index])
Base.empty(lp::PoolOfProjectors, device::Symbol) = empty!(lp.data[device])

function get_projector!(lp::PoolOfProjectors, index::Int, device::Symbol)

function get_projector_CSC(lp :: list_of_projectors, index::Proj_keys, device::Int64)
# sprawdz czy index in lp.data[device]; jesli nie to go dodaj biorac dane z lp.data[default_device]
return lp.data[device][index] # dodac element do dataGPU jak jest na cpu, ale nie na gpu ???
lp.data[device][index] # dodac element do dataGPU jak jest na cpu, ale nie na gpu ???
end


function add_projector(lp :: list_of_projectors, p::Proj)
if p in values(lp.data)
key = key of p_in_lp.data
else
key = generate_new_key
add!(lp.data, key => p)
return key
end