2 Commits

Author SHA1 Message Date
Jarvis Carroll 8d3d30425b Fix semicolon 2025-06-24 07:04:32 +10:00
spivee 92d061f572 Disable AVX2 for now
AVX2 is much less available than one would expect, is hard for e.g. me to test, and because of the way gmhive_worker currently works, the illegal-instruction exit codes go undetected, leaving users confused as their balance stays at zero, despite the app saying they are getting solutions.
2025-06-23 22:19:04 +09:00
7 changed files with 25 additions and 36 deletions
+1 -1
View File
@@ -3,6 +3,6 @@
{registered,[]},
{included_applications,[]},
{applications,[stdlib,kernel]},
{vsn,"0.2.6"},
{vsn,"0.2.5"},
{modules,[gajumine,gmc_con,gmc_conf,gmc_gui,gmc_sup]},
{mod,{gajumine,[]}}]}.
+1 -1
View File
@@ -3,7 +3,7 @@
%%% @end
-module(gajumine).
-vsn("0.2.6").
-vsn("0.2.5").
-behavior(application).
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <craigeverett@qpq.swiss>").
+5 -16
View File
@@ -3,7 +3,7 @@
%%% @end
-module(gmc_con).
-vsn("0.2.6").
-vsn("0.2.5").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <craigeverett@qpq.swiss>").
-license("GPL-3.0-or-later").
@@ -205,10 +205,7 @@ do_start_stop(#s{acc = PubKey, keys = Keys, network = Network, max_cores = MaxCo
{Fatness, Type} =
case os:type() of
{unix, linux} ->
case Network of
<<"mainnet">> -> {"mean", "avx2"};
<<"testnet">> -> {"mean", "generic"}
end;
{"mean", "generic"};
{unix, darwin} ->
% Check memory. >7gb gets mean, <7gb gets lean
{"mean", "generic"};
@@ -216,10 +213,7 @@ do_start_stop(#s{acc = PubKey, keys = Keys, network = Network, max_cores = MaxCo
% Check memory. >7gb gets mean, <7gb gets lean
% Check avx2.
% Both should be provided by the F# start program
case Network of
<<"mainnet">> -> {"mean", "avx2.exe"};
<<"testnet">> -> {"mean", "generic.exe"}
end
{"mean", "generic"}
end,
Miner = filename:join(platform_dir(), unicode:characters_to_binary([Fatness, Bits, "-", Type])),
Count = optimize_count(MaxCores, MaxMem),
@@ -270,13 +264,8 @@ platform_dir() ->
{unix, linux} ->
"linux_x86_64";
{unix, darwin} ->
case erlang:system_info(system_architecture) of
"aarch64-" ++ _ ->
"mac_m2";
Other ->
ok = log(info, "system_architecture: ~p", [Other]),
"mac_x86_64"
end;
% TODO: Check M2 vs x86
"mac_m2";
{win32, nt} ->
"win_x86_64"
end,
+14 -14
View File
@@ -3,7 +3,7 @@
%%% @end
-module(gmc_conf).
-vsn("0.2.6").
-vsn("0.2.5").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <craigeverett@qpq.swiss>").
-license("GPL-3.0-or-later").
@@ -18,15 +18,15 @@
-record(s,
{wx = none :: none | wx:wx_object(),
frame = none :: none | wx:wx_object(),
lang = en :: en | jp,
j = none :: none | fun(),
net = none :: none | wx:wx_object(),
acc = none :: none | wx:wx_object(),
keys = none :: none | wx:wx_object(),
cores = 2 :: pos_integer(),
memory = 3550722201 :: pos_integer()}).
{wx = none :: none | wx:wx_object(),
frame = none :: none | wx:wx_object(),
lang = en :: en | jp,
j = none :: none | fun(),
net = none :: none | wx:wx_object(),
acc = none :: none | wx:wx_object(),
keys = none :: none | wx:wx_object(),
cores = none :: none | wx:wx_object(),
memory = none :: none | wx:wx_object()}).
@@ -213,16 +213,16 @@ done(State = #s{net = Network, acc = AccTx, keys = KeysTx, cores = CoresTx, memo
buh_bye(State).
cores("") ->
2;
none;
cores(CoreS) ->
try
list_to_integer(CoreS)
catch
_:_ -> 2
_:_ -> none
end.
bytes("") ->
3550722201;
none;
bytes(GigsS) ->
try
list_to_integer(GigsS) * gig()
@@ -231,7 +231,7 @@ bytes(GigsS) ->
try
trunc(list_to_float(GigsS) * gig())
catch
_:_ -> 3550722201
_:_ -> none
end
end.
+1 -1
View File
@@ -3,7 +3,7 @@
%%% @end
-module(gmc_gui).
-vsn("0.2.6").
-vsn("0.2.5").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <craigeverett@qpq.swiss>").
-license("GPL-3.0-or-later").
+1 -1
View File
@@ -12,7 +12,7 @@
%%% @end
-module(gmc_sup).
-vsn("0.2.6").
-vsn("0.2.5").
-behaviour(supervisor).
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <craigeverett@qpq.swiss>").
+2 -2
View File
@@ -2,9 +2,9 @@
{type,gui}.
{modules,[]}.
{prefix,"gmc"}.
{desc,"Mining client for the Gajumaru Root"}.
{author,"Craig Everett"}.
{package_id,{"qpq","gajumine",{0,2,6}}}.
{desc,"Mining client for the Gajumaru Root"}.
{package_id,{"qpq","gajumine",{0,2,5}}}.
{deps,[{"uwiger","gmhive_client",{0,4,4}},
{"uwiger","gmcuckoo",{1,2,3}},
{"qpq","cuckoo_cpu",{0,3,0}},