Try Madmax plotters @ v0.9.9.

guydavis · Feb 6, 2023 · 04fb93d · 04fb93d
1 parent c0c6c27
commit 04fb93d
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 32 deletions.
diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
@@ -46,6 +46,7 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIA_BRANCH=release/1.7.0"
             "BLADEBIT_BRANCH=master"
+            "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:develop

diff --git a/.github/workflows/develop-chives.yaml b/.github/workflows/develop-chives.yaml
@@ -46,6 +46,7 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.3"
+            "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:develop

diff --git a/.github/workflows/develop-mmx.yaml b/.github/workflows/develop-mmx.yaml
@@ -45,6 +45,7 @@ jobs:
             "MACHINARIS_STREAM=develop"
             "MMX_BRANCH=master"
             "CHIA_BRANCH=latest"
+            "MADMAX_BRANCH=master"
             "PLOTMAN_BRANCH=development"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:develop

diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
@@ -45,6 +45,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=release/1.7.0"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:v${{ github.event.inputs.version }}

diff --git a/.github/workflows/main-chives.yaml b/.github/workflows/main-chives.yaml
@@ -45,6 +45,7 @@ jobs:
             "MACHINARIS_STREAM=latest"
             "CHIVES_REPO=https://github.com/HiveProject2021/chives-blockchain.git"
             "CHIVES_BRANCH=1.5.3"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chives:v${{ github.event.inputs.version }}

diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
@@ -44,8 +44,9 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "MMX_BRANCH=v0.9.8"
             "CHIA_BRANCH=latest"
+            "MMX_BRANCH=v0.9.9"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }}

diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
@@ -46,6 +46,7 @@ jobs:
             "CHIADOG_BRANCH=dev"
             "CHIA_BRANCH=release/1.7.0"
             "PLOTMAN_BRANCH=development"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris:test
diff --git a/.github/workflows/test-chives.yaml b/.github/workflows/test-chives.yaml
@@ -90,6 +90,7 @@ jobs:
             "CHIVES_REPO=https://github.com/foxypool/chives-blockchain.git"
             "CHIVES_BRANCH=main"
             "PLOTMAN_BRANCH=development"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-chivesfoxy:test
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
@@ -43,9 +43,10 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
-            "MMX_BRANCH=v0.9.8"
             "CHIA_BRANCH=latest"
             "PLOTMAN_BRANCH=development"
+            "MMX_BRANCH=v0.9.9"
+            "MADMAX_BRANCH=v0.9.9"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/scripts/madmax_setup.sh b/scripts/madmax_setup.sh
@@ -2,8 +2,6 @@
 #
 # Installs chia-plotter (pipelined multi-threaded) from binaries
 #
-# 
-#
 
 # As of 2022-08-20, https://github.com/madMAx43v3r/chia-plotter
 HASH=d1a9e88b44ba37f61bfabcb68e80e83f8b939648
@@ -13,34 +11,34 @@ ORIG_MADMAX_BRANCH=master
 MADMAX_BRANCH=$1
 
 # Currently Chia and Chives get the "old" Madmax plotter (no compresssion), built from source
-if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
-    if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
-        arch_name="$(uname -m)"
-        if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then
-            apt update && apt install -y libsodium-dev cmake g++ git build-essential
-            cd /
-            git clone --branch ${ORIG_MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git 
-            cd chia-plotter && echo "Building madmax on ${arch_name}..."
-            if [[ -z "${madmax_relic_main}" ]]; then  # Hack on 2021-11-29 due to failed builds on some systems...
-                sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt
-            fi
-            git submodule update --init
-            git checkout $HASH
-            ./make_devel.sh
-            mkdir -p /usr/lib/chia-plotter
-            cp -r ./build/* /usr/lib/chia-plotter
-            ln -s /usr/lib/chia-plotter/chia_plot /usr/bin/chia_plot
-            ln -s /usr/lib/chia-plotter/chia_plot_k34 /usr/bin/chia_plot_k34
-            cd /
-            rm -rf chia-plotter
-        else
-            echo "Building madmax skipped -> unsupported architecture: ${arch_name}"
-        fi
-    fi
-fi
+#if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
+#    if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
+#        arch_name="$(uname -m)"
+#        if [[ "${arch_name}" = "x86_64" ]] || [[ "${arch_name}" = "arm64" ]]; then
+#            apt update && apt install -y libsodium-dev cmake g++ git build-essential
+#            cd /
+#            git clone --branch ${ORIG_MADMAX_BRANCH} https://github.com/madMAx43v3r/chia-plotter.git 
+#            cd chia-plotter && echo "Building madmax on ${arch_name}..."
+#            if [[ -z "${madmax_relic_main}" ]]; then  # Hack on 2021-11-29 due to failed builds on some systems...
+#                sed -i 's/set(ENV{RELIC_MAIN} "1")/#set(ENV{RELIC_MAIN} "1")/g' CMakeLists.txt
+#            fi
+#            git submodule update --init
+#            git checkout $HASH
+#            ./make_devel.sh
+#            mkdir -p /usr/lib/chia-plotter
+#            cp -r ./build/* /usr/lib/chia-plotter
+#            ln -s /usr/lib/chia-plotter/chia_plot /usr/bin/chia_plot
+#            ln -s /usr/lib/chia-plotter/chia_plot_k34 /usr/bin/chia_plot_k34
+#            cd /
+#            rm -rf chia-plotter
+#       else
+#            echo "Building madmax skipped -> unsupported architecture: ${arch_name}"
+#        fi
+#    fi
+#fi
 
-# MMX blockchain container gets the "new" Madmax plotters, with compression, only available as binaries
-if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'mmx') ]]; then
+# MMX, Chia, and Chives blockchain container gets the "new" Madmax plotters, with compression, only available as binaries
+if [[ (${mode} == 'fullnode' || ${mode} =~ "plotter") && (${blockchains} == 'mmx' || ${blockchains} == 'chia' || ${blockchains} == 'chives') ]]; then
     if [ ! -f /usr/bin/chia_plot ] && [[ "${madmax_skip_build}" != 'true' ]]; then
         arch_name="$(uname -m)"
         if [[ "${arch_name}" = "x86_64" ]]; then

diff --git a/scripts/pull_3rd_party_libs.sh b/scripts/pull_3rd_party_libs.sh
@@ -17,7 +17,7 @@ https://cdn.datatables.net/1.13.1/css/dataTables.bootstrap5.css
 https://cdn.datatables.net/1.13.1/js/dataTables.bootstrap5.js
 https://cdn.datatables.net/1.13.1/js/jquery.dataTables.js
 https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.min.js
-https://cdn.jsdelivr.net/npm/[email protected].0/dist/chartjs-adapter-luxon.umd.min.js
+https://cdn.jsdelivr.net/npm/[email protected].1/dist/chartjs-adapter-luxon.umd.min.js
 https://cdn.jsdelivr.net/npm/[email protected]/dist/chartjs-plugin-datalabels.min.js
 https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js
 https://moment.github.io/luxon/global/luxon.min.js"