Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: madMAx43v3r/chia-plotter
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: stotiks/chia-plotter
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
3 contributors

Commits on Jun 8, 2021

  1. uint128_t for windows

    @stotiks
    stotiks committed Jun 8, 2021
    Copy the full SHA
    ef5c554 View commit details

  2. ignore *.bak

    @stotiks
    stotiks committed Jun 8, 2021
    Copy the full SHA
    bd22ea7 View commit details

  3. Merge branch 'windows' of https://github.com/stotiks/chia-plotter int… 

    …o windows
    @stotiks
    stotiks committed Jun 8, 2021
    Copy the full SHA
    17c8f1e View commit details

  4. windows build - fury road

    @stotiks
    stotiks committed Jun 8, 2021
    Copy the full SHA
    631344b View commit details

  5. Merge branch 'madMAx43v3r:master' into windows

    @stotiks
    stotiks committed Jun 8, 2021
    Copy the full SHA
    52accf3 View commit details

Commits on Jun 9, 2021

  1. FOPEN FSEEK

    @stotiks
    stotiks committed Jun 9, 2021
    Copy the full SHA
    a5377e9 View commit details

  2. Merge pull request #2 from stotiks/windows 

    FOPEN FSEEK
    @stotiks
    stotiks authored Jun 9, 2021
    Copy the full SHA
    440de24 View commit details

  3. fix

    @stotiks
    stotiks committed Jun 9, 2021
    Copy the full SHA
    856f194 View commit details

  4. fix

    @stotiks
    stotiks committed Jun 9, 2021
    Copy the full SHA
    8aab570 View commit details

  5. Merge branch 'master' of https://github.com/madMAx43v3r/chia-plotter … 

    …into madMAx43v3r-master
    @stotiks
    stotiks committed Jun 9, 2021
    Copy the full SHA
    52a0b8c View commit details

  6. Merge branch 'madMAx43v3r-master' into path-to-redemption

    @stotiks
    stotiks committed Jun 9, 2021
    Copy the full SHA
    65affac View commit details

Commits on Jun 10, 2021

  1. FOPEN

    @stotiks
    stotiks committed Jun 10, 2021
    Copy the full SHA
    cecc58c View commit details

  2. CMake fix

    @stotiks
    stotiks committed Jun 10, 2021
    Copy the full SHA
    e635138 View commit details

  3. Merge pull request #5 from stotiks/path-to-redemption 

    Path to redemption
    @stotiks
    stotiks authored Jun 10, 2021
    Copy the full SHA
    8d88fef View commit details

  4. Merge pull request #6 from stotiks/windows-fury-road 

    Windows fury road
    @stotiks
    stotiks authored Jun 10, 2021
    Copy the full SHA
    07611ea View commit details

Commits on Jun 11, 2021

  1. static link

    @stotiks
    stotiks committed Jun 11, 2021
    Copy the full SHA
    4b9f261 View commit details

Commits on Jun 13, 2021

  1. Win Exception handle

    @stotiks
    stotiks committed Jun 13, 2021
    Copy the full SHA
    1078ec8 View commit details

  2. add_definitions for BLAKE3

    @stotiks
    stotiks committed Jun 13, 2021
    Copy the full SHA
    abdc052 View commit details

  3. Merge pull request #7 from stotiks/windows-fury-road 

    Windows fury road
    @stotiks
    stotiks authored Jun 13, 2021
    Copy the full SHA
    6d38b86 View commit details

  4. Merge branch 'master' of https://github.com/madMAx43v3r/chia-plotter … 

    …into windows-fury-road
    @stotiks
    stotiks committed Jun 13, 2021
    Copy the full SHA
    4463503 View commit details

  5. CMakeLists.txt fix

    @stotiks
    stotiks committed Jun 13, 2021
    Copy the full SHA
    f850d97 View commit details

  6. BUILD_INFO

    @stotiks
    stotiks committed Jun 13, 2021
    Copy the full SHA
    a3dcb92 View commit details

  7. CMakeLists.txt

    @stotiks
    stotiks committed Jun 13, 2021
    Copy the full SHA
    d79a8da View commit details

Commits on Jun 14, 2021

  1. chia_plot.cpp info

    @stotiks
    stotiks committed Jun 14, 2021
    Copy the full SHA
    aff2601 View commit details

Commits on Jun 17, 2021

  1. fix

    @stotiks
    stotiks committed Jun 17, 2021
    Copy the full SHA
    6642b29 View commit details

Commits on Jun 18, 2021

  1. Merge branch 'master' of https://github.com/madMAx43v3r/chia-plotter … 

    …into windows-fury-road
    @stotiks
    stotiks committed Jun 18, 2021
    Copy the full SHA
    de7959e View commit details

  2. Merge pull request #16 from stotiks/windows-fury-road 

    Windows fury road v.0.0.5
    @stotiks
    stotiks authored Jun 18, 2021
    Copy the full SHA
    843700d View commit details

  3. CMakeLists.txt CHIA_PLOT_BUILD_TESTS

    @stotiks
    stotiks committed Jun 18, 2021
    Copy the full SHA
    b2cb334 View commit details

  4. WIN _setmaxstdio

    @stotiks
    stotiks committed Jun 18, 2021
    Copy the full SHA
    35b0731 View commit details

Commits on Jun 19, 2021

  1. num_files_max fix

    @stotiks
    stotiks committed Jun 19, 2021
    Copy the full SHA
    735f815 View commit details

Commits on Jun 20, 2021

  1. Merge branch 'master' of https://github.com/madMAx43v3r/chia-plotter … 

    …into windows-fury-road
    @stotiks
    stotiks committed Jun 20, 2021
    Copy the full SHA
    249c365 View commit details

  2. Merge pull request #17 from stotiks/windows-fury-road 

    Windows fury road
    @stotiks
    stotiks authored Jun 20, 2021
    Copy the full SHA
    641a1e1 View commit details

  3. total_bytes for win

    @stotiks
    stotiks committed Jun 20, 2021
    Copy the full SHA
    35e264f View commit details

Commits on Jun 29, 2021

  1. fast chacha8.c

    @stotiks
    stotiks committed Jun 29, 2021
    Copy the full SHA
    933523a View commit details

  2. #include <chia/DiskSort.hpp>

    @stotiks
    stotiks committed Jun 29, 2021
    Copy the full SHA
    5c18da2 View commit details

  3. SODIUM STATIC 

    GMP
    @stotiks
    stotiks committed Jun 29, 2021
    Copy the full SHA
    ce511cc View commit details

Commits on Jun 30, 2021

  1. Merge branch 'master' of https://github.com/madMAx43v3r/chia-plotter … 

    …into windows-fury-road
    @stotiks
    stotiks committed Jun 30, 2021
    Copy the full SHA
    1597ea3 View commit details

Commits on Jul 3, 2021

  1. Merge pull request #18 from stotiks/windows-fury-road 

    Windows fury road
    @stotiks
    stotiks authored Jul 3, 2021
    Copy the full SHA
    8a40cd8 View commit details

  2. Merge branch 'pool-puzzles' of https://github.com/madMAx43v3r/chia-pl… 

    …otter into wfr-ph
    @stotiks
    stotiks committed Jul 3, 2021
    Copy the full SHA
    9e7b4c3 View commit details

  3. Delete .github/workflows directory

    @stotiks
    stotiks authored Jul 3, 2021
    Copy the full SHA
    2ddd54b View commit details

  4. Delete .github/workflows directory

    @stotiks
    stotiks authored Jul 3, 2021
    Copy the full SHA
    a53cf8e View commit details

Commits on Jul 4, 2021

  1. Merge branch 'wfr-ph' of https://github.com/stotiks/chia-plotter into… 

    … windows-fury-road
    @stotiks
    stotiks committed Jul 4, 2021
    Copy the full SHA
    82f92a9 View commit details

  2. Merge pull request #19 from stotiks/windows-fury-road 

    Windows fury road
    @stotiks
    stotiks authored Jul 4, 2021
    Copy the full SHA
    6f7fef7 View commit details

Commits on Jul 23, 2021

  1. Merge branch 'master' of https://github.com/madMAx43v3r/chia-plotter … 

    …into windows-fury-road
    @stotiks
    stotiks committed Jul 23, 2021
    Copy the full SHA
    055a5db View commit details

Commits on Jul 26, 2021

  1. Merge pull request #21 from stotiks/windows-fury-road 

    Windows fury road
    @stotiks
    stotiks authored Jul 26, 2021
    Copy the full SHA
    9ed894f View commit details

Commits on Aug 16, 2021

  1. g_read_thread_divider for phase 1

    @madMAx43v3r
    madMAx43v3r committed Aug 16, 2021
    Copy the full SHA
    fe59d01 View commit details

  2. g_read_thread_divider for phase 2, 3 and 4

    @madMAx43v3r
    madMAx43v3r committed Aug 16, 2021
    Copy the full SHA
    87f4608 View commit details

Commits on Aug 24, 2021

  1. number of read threads fixes

    Max Wittal committed Aug 24, 2021
    Copy the full SHA
    cc2a963 View commit details

  2. Merge branch 'read-threads-tune' of https://github.com/madMAx43v3r/ch… 

    …ia-plotter into windows-fury-road
    @stotiks
    stotiks committed Aug 24, 2021
    Copy the full SHA
    95d46dc View commit details

Commits on Aug 26, 2021

  1. Merge branch 'master' of https://github.com/madMAx43v3r/chia-plotter … 

    …into windows-fury-road
    @stotiks
    stotiks committed Aug 26, 2021
    Copy the full SHA
    c6664a0 View commit details
54 changes: 0 additions & 54 deletions .github/workflows/build-osx.yml
View file

This file was deleted.

54 changes: 0 additions & 54 deletions .github/workflows/build.yml
View file

This file was deleted.

79 changes: 0 additions & 79 deletions .github/workflows/docker-build.yml
View file

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/build
*.out
*.tmp
*.bak
123 changes: 91 additions & 32 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,10 @@ add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")

project(chia-plotter C CXX ASM)

if(NOT CHIA_PLOT_BUILD_TESTS)
set(CHIA_PLOT_BUILD_TESTS true)
endif()

# Add path for custom modules
set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
@@ -19,25 +23,41 @@ set(CMAKE_MODULE_PATH

set(TARGET_ARCH ${CMAKE_HOST_SYSTEM_PROCESSOR})
message(STATUS "Architecture: ${TARGET_ARCH}")

set(ENV{RELIC_MAIN} "1")
add_subdirectory(lib/bls-signatures)

add_subdirectory(lib/libbech32)

find_package(Threads REQUIRED)

if(APPLE)
find_package(sodium REQUIRED)
if (MSVC)

add_definitions(-DCHIA_PLOT_BUILD_INFO="${CHIA_PLOT_BUILD_INFO}")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
add_definitions(-DSODIUM_STATIC=TRUE)

add_definitions(-D_CRT_SECURE_NO_WARNINGS)

include_directories(
${sodium_INCLUDE_DIR}
${GMP_INCLUDE_DIR}
)

else()
find_package(Threads REQUIRED)

if(APPLE)
find_package(sodium REQUIRED)
endif()

if (SODIUM_FOUND)
message(STATUS "Found libsodium")
message(STATUS "Sodium include dir = ${sodium_INCLUDE_DIR}")
include_directories(${sodium_INCLUDE_DIR})
endif()

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function")
endif()

if (SODIUM_FOUND)
message(STATUS "Found libsodium")
message(STATUS "Sodium include dir = ${sodium_INCLUDE_DIR}")
include_directories(${sodium_INCLUDE_DIR})
endif()
add_subdirectory(lib/bls-signatures)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-function")
add_subdirectory(lib/libbech32)

set(BLAKE3_PATH lib/BLAKE3/c)
set(FSE_PATH lib/FSE/lib)
@@ -52,13 +72,21 @@ include_directories(
${CMAKE_BINARY_DIR}/_deps/relic-build/include
)

#add_definitions(-DBLAKE3_NO_SSE2=true)
#add_definitions(-DBLAKE3_NO_SSE41=true)
#add_definitions(-DBLAKE3_NO_AVX2=true)
#add_definitions(-DBLAKE3_NO_AVX512=true)

IF (WIN32)
set(BLAKE3_SRC
${BLAKE3_PATH}/blake3.c
${BLAKE3_PATH}/blake3_portable.c
${BLAKE3_PATH}/blake3_dispatch.c
${BLAKE3_PATH}/blake3_sse41_x86-64_windows_gnu.S
${BLAKE3_PATH}/blake3_sse2_x86-64_windows_gnu.S

${BLAKE3_PATH}/blake3_sse2.c
${BLAKE3_PATH}/blake3_sse41.c
${BLAKE3_PATH}/blake3_avx2.c
${BLAKE3_PATH}/blake3_avx512.c
)
ELSEIF(TARGET_ARCH STREQUAL "x86_64")
set(BLAKE3_SRC
@@ -94,28 +122,59 @@ add_library(chia_plotter STATIC
src/settings.cpp
)

target_link_libraries(chia_plotter blake3 fse bech32 Threads::Threads)
if (MSVC)
target_link_libraries(chia_plotter blake3 fse bech32)
else()
target_link_libraries(chia_plotter blake3 fse bech32 Threads::Threads)
endif()

add_executable(test_copy test/test_copy.cpp)
add_executable(test_disk_sort test/test_disk_sort.cpp)
if(CHIA_PLOT_BUILD_TESTS)
add_executable(test_copy test/test_copy.cpp)
add_executable(test_disk_sort test/test_disk_sort.cpp)

add_executable(test_phase_1 test/test_phase_1.cpp)
add_executable(test_phase_2 test/test_phase_2.cpp)
add_executable(test_phase_3 test/test_phase_3.cpp)
add_executable(test_phase_4 test/test_phase_4.cpp)
add_executable(test_phase_1 test/test_phase_1.cpp)
add_executable(test_phase_2 test/test_phase_2.cpp)
add_executable(test_phase_3 test/test_phase_3.cpp)
add_executable(test_phase_4 test/test_phase_4.cpp)

add_executable(check_phase_1 test/check_phase_1.cpp)
add_executable(check_phase_1 test/check_phase_1.cpp)
endif()

add_executable(chia_plot src/chia_plot.cpp)

target_link_libraries(test_copy chia_plotter)
target_link_libraries(test_disk_sort chia_plotter)
if (MSVC)

add_library(uint128 STATIC uint128_t/uint128_t.cpp)
target_include_directories(uint128 PUBLIC uint128_t)

if(CHIA_PLOT_BUILD_TESTS)
target_link_libraries(test_copy chia_plotter)
target_link_libraries(test_disk_sort chia_plotter uint128)
target_link_libraries(test_phase_1 chia_plotter uint128)
target_link_libraries(test_phase_2 chia_plotter uint128)
target_link_libraries(test_phase_3 chia_plotter uint128)
target_link_libraries(test_phase_4 chia_plotter uint128)
target_link_libraries(check_phase_1 chia_plotter uint128)
endif()

target_link_libraries(chia_plot chia_plotter bls uint128)
set_target_properties(chia_plot PROPERTIES LINK_OPTIONS -NODEFAULTLIB:MSVCRT)

target_link_libraries(test_phase_1 chia_plotter)
target_link_libraries(test_phase_2 chia_plotter)
target_link_libraries(test_phase_3 chia_plotter)
target_link_libraries(test_phase_4 chia_plotter)
else()

target_link_libraries(check_phase_1 chia_plotter)
if(CHIA_PLOT_BUILD_TESTS)
target_link_libraries(test_copy chia_plotter)
target_link_libraries(test_disk_sort chia_plotter)

target_link_libraries(test_phase_1 chia_plotter)
target_link_libraries(test_phase_2 chia_plotter)
target_link_libraries(test_phase_3 chia_plotter)
target_link_libraries(test_phase_4 chia_plotter)

target_link_libraries(check_phase_1 chia_plotter)
endif()

target_link_libraries(chia_plot chia_plotter bls sodium)

endif()

target_link_libraries(chia_plot chia_plotter bls sodium)
3 changes: 2 additions & 1 deletion include/chia/DiskSort.hpp
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
#ifndef INCLUDE_CHIA_DISKSORT_HPP_
#define INCLUDE_CHIA_DISKSORT_HPP_

#include <chia/stdiox.hpp>
#include <chia/DiskSort.h>
#include <chia/util.hpp>

@@ -22,7 +23,7 @@ void DiskSort<T, Key>::bucket_t::open(const char* mode)
if(file) {
fclose(file);
}
file = fopen(file_name.c_str(), mode);
file = FOPEN(file_name.c_str(), mode);
if(!file) {
throw std::runtime_error("fopen() failed");
}
Loading