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

core: remove argon2d enhanced cpu/gpu mining logic #471

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
153 changes: 0 additions & 153 deletions build-aux/m4/ax_check_cuda.m4

This file was deleted.

28 changes: 0 additions & 28 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,6 @@ AC_ARG_ENABLE([wallet],
[enable_wallet=$enableval],
[enable_wallet=yes])

# Enable GPU miner
AC_ARG_ENABLE([gpu],
[AS_HELP_STRING([--enable-gpu],
[enable GPU miner (disabled by default)])],
[enable_gpu=$enableval],
[enable_gpu=no])

# Enable CUDA
AC_ARG_ENABLE([cuda],
[AS_HELP_STRING([--enable-cuda],
[enable CUDA miner (defaults is no)])],
[enable_cuda=$enableval],
[enable_cuda=no])

AC_ARG_WITH([miniupnpc],
[AS_HELP_STRING([--with-miniupnpc],
[enable UPNP (default is yes if libminiupnpc is found)])],
Expand Down Expand Up @@ -963,18 +949,6 @@ else
AC_MSG_RESULT(no)
fi

if test x$enable_gpu = xyes; then
AC_DEFINE_UNQUOTED([ENABLE_GPU],[1],[Define to 1 to enable GPU miner])

if test "x$enable_cuda" = xyes; then
AX_CHECK_CUDA
if test "x$NVCC" = xno; then
enable_cuda=no
AC_MSG_WARN([NVIDIA CUDA nvcc compiler not found, falling back on OpenCL. Specify --with-cuda=/path/to/cuda or --disable-gpu])
fi
fi
fi

dnl enable upnp support
AC_MSG_CHECKING([whether to build with support for UPnP])
if test x$have_miniupnpc = xno; then
Expand Down Expand Up @@ -1067,8 +1041,6 @@ fi
AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])
AM_CONDITIONAL([BUILD_DARWIN], [test x$BUILD_OS = xdarwin])
AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows])
AM_CONDITIONAL([ENABLE_GPU],[test x$enable_gpu = xyes])
AM_CONDITIONAL([ENABLE_CUDA], [test x"$enable_cuda" = xyes])
AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet = xyes])
AM_CONDITIONAL([ENABLE_TESTS],[test x$BUILD_TEST = xyes])
AM_CONDITIONAL([ENABLE_QT],[test x$dynamic_enable_qt = xyes])
Expand Down
24 changes: 2 additions & 22 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -160,16 +160,7 @@ DYNAMIC_CORE_H = \
memusage.h \
merkleblock.h \
messagesigner.h \
miner/impl/miner-cpu.h \
miner/impl/miner-gpu.h \
miner/internal/hash-rate-counter.h \
miner/internal/miner-base.h \
miner/internal/miner-context.h \
miner/internal/miners-controller.h \
miner/internal/miners-group.h \
miner/internal/thread-group.h \
miner/miner-util.h \
miner/miner.h \
miner.h \
net.h \
net_processing.h \
netaddress.h \
Expand Down Expand Up @@ -315,14 +306,7 @@ libdynamic_server_a_SOURCES = \
instantsend.cpp \
merkleblock.cpp \
messagesigner.cpp \
miner/impl/miner-cpu.cpp \
miner/impl/miner-gpu.cpp \
miner/internal/hash-rate-counter.cpp \
miner/internal/miner-base.cpp \
miner/internal/miner-context.cpp \
miner/internal/miners-controller.cpp \
miner/miner-util.cpp \
miner/miner.cpp \
miner.cpp \
net.cpp \
netfulfilledman.cpp \
net_processing.cpp \
Expand Down Expand Up @@ -685,10 +669,6 @@ endif

include Makefile.vgp.include

if ENABLE_GPU
include Makefile.gpu.include
endif

if ENABLE_TESTS
include Makefile.test.include
endif
Expand Down
4 changes: 0 additions & 4 deletions src/Makefile.dht.test.include
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ dht_test_data_test_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -
if ENABLE_ZMQ
dht_test_data_test_LDADD += $(LIBDYNAMIC_ZMQ) $(ZMQ_LIBS)
endif
if ENABLE_GPU
dht_test_data_test_LDADD += $(LIBDYNAMIC_GPU_LDADD_EXTRA)
dht_test_data_test_LDFLAGS += $(LIBDYNAMIC_GPU_LDFLAGS_EXTRA)
endif

nodist_dht_test_data_test_SOURCES = $(GENERATED_DHT_TEST_FILES)

Expand Down
120 changes: 0 additions & 120 deletions src/Makefile.gpu.include

This file was deleted.

Loading