From 4fab3d5c7123ea7e4a0379b76071bd69af61711d Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 23 Jan 2020 19:47:20 -0800 Subject: [PATCH 1/3] update project list --- .../installerv2/redist/all_projects_list.xml | 242 ++++++++---------- 1 file changed, 107 insertions(+), 135 deletions(-) diff --git a/win_build/installerv2/redist/all_projects_list.xml b/win_build/installerv2/redist/all_projects_list.xml index a6543dd4bf2..22989ceb8f7 100644 --- a/win_build/installerv2/redist/all_projects_list.xml +++ b/win_build/installerv2/redist/all_projects_list.xml @@ -89,24 +89,6 @@ Study diseases such as HIV, malaria, cancer, and Alzheimer's 9 13 11 23 24 28 - - Acoustics@home - 9 - http://www.acousticsathome.ru/boinc/ - http://www.acousticsathome.ru/boinc/ - Physical Science - Physics, Underwater acoustics - - V.I. Ilichev Pacific Oceanological Institute, Far Eastern Federal University, Matrosov Institute for System Dynamics and Control Theory, A.A. Kharkevich Institute for Information Transmission Problems, Dorodnicyn Computing Centre - - i686-pc-linux-gnu - windows_intelx86 - windows_x86_64 - x86_64-pc-linux-gnu - - Study underwater acoustics - 6 20 44 - Asteroids@home 11 @@ -239,52 +221,40 @@ arm-android-linux-gnu[VFP] arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf[NEON] - arm-unknown-linux-gnueabihf[NEON_Beta] - i686-apple-darwin[BRP4G-Beta-cuda32-OSX] - i686-apple-darwin[BRP4G-Beta-opencl-ati-Lion] - i686-apple-darwin[BRP4G-cuda32-OSX] - i686-apple-darwin[BRP4G-opencl-ati-lion] - i686-pc-linux-gnu[BRP4G-Beta-cuda32-nv270] - i686-pc-linux-gnu[BRP4G-Beta-opencl-ati] - i686-pc-linux-gnu[BRP4G-cuda32-nv270] - i686-pc-linux-gnu[BRP4G-opencl-ati] i686-pc-linux-gnu[FGRPSSE] powerpc-apple-darwin[ALTIVEC] - windows_intelx86[BRP4G-Beta-cuda32] - windows_intelx86[BRP4G-Beta-cuda32-nv301] - windows_intelx86[BRP4G-Beta-cuda55] - windows_intelx86[BRP4G-Beta-opencl-ati] - windows_intelx86[BRP4G-Beta-opencl-intel_gpu] - windows_intelx86[BRP4G-cuda32] - windows_intelx86[BRP4G-cuda32-nv301] - windows_intelx86[BRP4G-opencl-ati] windows_intelx86[FGRPSSE] windows_intelx86[opencl-intel_gpu] - windows_x86_64[BRP4G-Beta-opencl-ati] - windows_x86_64[BRP4G-Beta-opencl-intel_gpu] - windows_x86_64[BRP4G-opencl-ati] + windows_x86_64[BRP4-opencl-intel_gpu-nd] windows_x86_64[FGRPopencl-ati] + windows_x86_64[FGRPopencl-intel_gpu] windows_x86_64[FGRPopencl-nvidia] windows_x86_64[FGRPopencl1K-ati] windows_x86_64[FGRPopencl1K-nvidia] + windows_x86_64[FGRPopenclTV-nvidia] + windows_x86_64[GW-opencl-ati] + windows_x86_64[GW-opencl-nvidia] + windows_x86_64[GWnew] + windows_x86_64[GWold] windows_x86_64[opencl-intel_gpu] windows_x86_64[opencl-intel_gpu-Beta] windows_x86_64[opencl-intel_gpu-new] - x86_64-apple-darwin[BRP4G-Beta-cuda55-Lion] x86_64-apple-darwin[FGRPopencl-ati-mav] x86_64-apple-darwin[FGRPopencl-nvidia-mav] x86_64-apple-darwin[FGRPSSE] - x86_64-pc-linux-gnu[BRP4G-Beta-cuda32-nv270] - x86_64-pc-linux-gnu[BRP4G-Beta-cuda55] - x86_64-pc-linux-gnu[BRP4G-Beta-opencl-ati] - x86_64-pc-linux-gnu[BRP4G-Beta-opencl-intel_gpu] - x86_64-pc-linux-gnu[BRP4G-cuda32-nv270] - x86_64-pc-linux-gnu[BRP4G-opencl-ati] + x86_64-apple-darwin[GW-opencl-ati] + x86_64-apple-darwin[GW-opencl-nvidia] + x86_64-apple-darwin[Lion] x86_64-pc-linux-gnu[FGRPopencl-ati] x86_64-pc-linux-gnu[FGRPopencl-nvidia] x86_64-pc-linux-gnu[FGRPopencl1K-ati] x86_64-pc-linux-gnu[FGRPopencl1K-nvidia] + x86_64-pc-linux-gnu[FGRPopenclTV-nvidia] x86_64-pc-linux-gnu[FGRPSSE] + x86_64-pc-linux-gnu[GW-opencl-ati] + x86_64-pc-linux-gnu[GW-opencl-nvidia] + x86_64-pc-linux-gnu[GWnew] + x86_64-pc-linux-gnu[GWold] https://boinc.berkeley.edu/images/einstein.jpg Help detect pulsars and gravitational waves @@ -302,40 +272,29 @@ aarch64-android-linux-gnu aarch64-unknown-linux-gnu - arm-unknown-linux-gnueabihf - armv6l-unknown-linux-gnueabihf - armv7l-unknown-linux-gnueabihf i686-pc-linux-gnu[sse2] - i686-pc-linux-gnu[vbox32] - powerpc64le-unknown-linux-gnu - ppc64-linux-gnu + windows_intelx86 windows_intelx86[avx] windows_intelx86[sse2] - windows_intelx86[vbox32] windows_x86_64[avx] windows_x86_64[sse2] windows_x86_64[vbox64] - windows_x86_64[vbox64_mt_mcore] windows_x86_64[vbox64_mt_mcore_atlas] - windows_x86_64[vbox64_mt_mcore_lhcb] - x86-android-linux-gnu[sse2] - x86_64-android-linux-gnu[sse2] + windows_x86_64[vbox64_theory] x86_64-apple-darwin[avx] x86_64-apple-darwin[sse2] x86_64-apple-darwin[vbox64] - x86_64-apple-darwin[vbox64_mt_mcore] x86_64-apple-darwin[vbox64_mt_mcore_atlas] - x86_64-apple-darwin[vbox64_mt_mcore_lhcb] + x86_64-apple-darwin[vbox64_theory] x86_64-pc-freebsd[avx] x86_64-pc-freebsd[sse2] x86_64-pc-linux-gnu[avx] x86_64-pc-linux-gnu[native_mt] + x86_64-pc-linux-gnu[native_theory] x86_64-pc-linux-gnu[sse2] x86_64-pc-linux-gnu[vbox64] - x86_64-pc-linux-gnu[vbox64_mt_mcore] x86_64-pc-linux-gnu[vbox64_mt_mcore_atlas] - x86_64-pc-linux-gnu[vbox64_mt_mcore_lhcb] - x86_64-pc-openbsd[sse2] + x86_64-pc-linux-gnu[vbox64_theory] https://boinc.berkeley.edu/images/lhc.jpg Improve the design of the Large Hadron Collider @@ -368,7 +327,7 @@ arm-android-linux-gnu[armv7-vfpv4] arm-android-linux-gnu[armv7-vfpv4-nopie] arm-unknown-linux-gnueabihf - i686-apple-darwin + i686-apple-darwin[mac_intel32] i686-apple-darwin[osx_12] i686-pc-linux-gnu i686-pc-linux-gnu[sse] @@ -410,7 +369,7 @@ x86_64-apple-darwin[opencl_ati_mac] x86_64-apple-darwin[opencl_intel_gpu_mac] x86_64-apple-darwin[opencl_intel_gpu_sah] - x86_64-apple-darwin[opencl_nvidia_mac] + x86_64-apple-darwin[opencl_nvidia_mac_old] x86_64-apple-darwin[osx_12] x86_64-apple-darwin[sse3] x86_64-pc-linux-gnu @@ -439,6 +398,22 @@ Search for evidence of extra-terrestrial life 1 2 23 24 25 + + nanoHUB@Home + 43 + https://boinc.nanohub.org/nanoHUB_at_home/ + https://boinc.nanohub.org/nanoHUB_at_home/ + Physical Science + Nanoscience + + Purdue University + + windows_x86_64[vbox64_mt] + x86_64-apple-darwin[vbox64_mt] + x86_64-pc-linux-gnu[vbox64_mt] + + 23 24 8 + Amicable Numbers 23 @@ -473,11 +448,15 @@ Arizona State University, school of Mathematics - i686-pc-linux-gnu - windows_intelx86 - windows_x86_64 - x86_64-apple-darwin - x86_64-pc-linux-gnu + i686-pc-linux-gnu[default] + windows_intelx86[default] + windows_x86_64[default] + windows_x86_64[opencl_amd] + windows_x86_64[opencl_nvidia] + x86_64-apple-darwin[default] + x86_64-pc-linux-gnu[cuda30] + x86_64-pc-linux-gnu[default] + x86_64-pc-linux-gnu[opencl_amd] https://boinc.berkeley.edu/images/nf_banner_10.jpg Do research in algebraic number theory @@ -493,12 +472,12 @@ Independent - i686-pc-freebsd - i686-pc-linux-gnu windows_intelx86 windows_x86_64 - x86_64-pc-freebsd + i686-pc-linux-gnu x86_64-pc-linux-gnu + x86_64-pc-freebsd + i686-pc-freebsd Discover Latin Squares 15 20 44 46 @@ -523,25 +502,6 @@ Discover Latin Squares 15 20 44 46 - - SAT@home - 25 - http://sat.isa.ru/pdsat/ - http://sat.isa.ru/pdsat/ - Mathematics, computing, and games - Computer Science - - Institute for System Dynamics and Control Theory and Institute for Information Transmission Problems, Russian Academy of Science - - i686-pc-linux-gnu - windows_intelx86 - windows_x86_64 - x86_64-pc-linux-gnu - - https://boinc.berkeley.edu/images/sat_logo.png - Study computational complexity - 15 20 44 46 - Moo! Wrapper 26 @@ -679,26 +639,17 @@ Independent - i686-apple-darwin - i686-apple-darwin[cpuGFN16] - i686-apple-darwin[cpuGFN17LOW] - i686-apple-darwin[cpuGFN17MEGA] - i686-apple-darwin[cpuGFN18] - i686-apple-darwin[cpuGFN19] - i686-apple-darwin[cpuGFN20] - i686-apple-darwin[cpuGFN21] - i686-apple-darwin[cpuPPSsieve] - i686-apple-darwin[cudaPPSsieve] i686-pc-linux-gnu i686-pc-linux-gnu[cpuGFN16] i686-pc-linux-gnu[cpuGFN17LOW] - i686-pc-linux-gnu[cpuGFN17MEGA] i686-pc-linux-gnu[cpuGFN18] i686-pc-linux-gnu[cpuGFN19] i686-pc-linux-gnu[cpuGFN20] i686-pc-linux-gnu[cpuGFN21] + i686-pc-linux-gnu[cpuGFN22] i686-pc-linux-gnu[cpuPPSsieve] i686-pc-linux-gnu[cudaPPSsieve] + i686-pc-linux-gnu[mt] i686-pc-linux-gnu[OCLcudaGFN] i686-pc-linux-gnu[OCLcudaGFN15] i686-pc-linux-gnu[OCLcudaGFN16] @@ -707,6 +658,7 @@ i686-pc-linux-gnu[OCLcudaGFN18] i686-pc-linux-gnu[OCLcudaGFN19] i686-pc-linux-gnu[OCLcudaGFN20] + i686-pc-linux-gnu[OCLcudaGFNEXTREME] i686-pc-linux-gnu[OCLcudaGFNWR] i686-pc-linux-gnu[openclatiGFN15] i686-pc-linux-gnu[openclatiGFN16] @@ -717,17 +669,19 @@ i686-pc-linux-gnu[openclatiGFN20] i686-pc-linux-gnu[openclatiGFN21] i686-pc-linux-gnu[openclatiGFN22] + i686-pc-linux-gnu[openclatiGFNEXTREME] i686-pc-linux-gnu[openclatiPPSsieve] windows_intelx86 windows_intelx86[cpuGFN16] windows_intelx86[cpuGFN17LOW] - windows_intelx86[cpuGFN17MEGA] windows_intelx86[cpuGFN18] windows_intelx86[cpuGFN19] windows_intelx86[cpuGFN20] windows_intelx86[cpuGFN21] + windows_intelx86[cpuGFN22] windows_intelx86[cpuPPSsieve] windows_intelx86[cudaPPSsieve] + windows_intelx86[mt] windows_intelx86[OCLcudaGFN] windows_intelx86[OCLcudaGFN15] windows_intelx86[OCLcudaGFN16] @@ -736,6 +690,7 @@ windows_intelx86[OCLcudaGFN18] windows_intelx86[OCLcudaGFN19] windows_intelx86[OCLcudaGFN20] + windows_intelx86[OCLcudaGFNEXTREME] windows_intelx86[OCLcudaGFNWR] windows_intelx86[openclatiGFN15] windows_intelx86[openclatiGFN16] @@ -746,30 +701,33 @@ windows_intelx86[openclatiGFN20] windows_intelx86[openclatiGFN21] windows_intelx86[openclatiGFN22] + windows_intelx86[openclatiGFNEXTREME] windows_intelx86[openclatiPPSsieve] windows_x86_64 windows_x86_64[cpuGFN16] windows_x86_64[cpuGFN17LOW] - windows_x86_64[cpuGFN17MEGA] windows_x86_64[cpuGFN18] windows_x86_64[cpuGFN19] windows_x86_64[cpuGFN20] windows_x86_64[cpuGFN21] + windows_x86_64[cpuGFN22] windows_x86_64[cpuPPSsieve] windows_x86_64[cpu_AP27] + windows_x86_64[mt] windows_x86_64[OCL_cuda_AP27] windows_x86_64[opencl_ati_AP27] x86_64-apple-darwin x86_64-apple-darwin[cpuGFN16] x86_64-apple-darwin[cpuGFN17LOW] - x86_64-apple-darwin[cpuGFN17MEGA] x86_64-apple-darwin[cpuGFN18] x86_64-apple-darwin[cpuGFN19] x86_64-apple-darwin[cpuGFN20] x86_64-apple-darwin[cpuGFN21] + x86_64-apple-darwin[cpuGFN22] x86_64-apple-darwin[cpuPPSsieve] x86_64-apple-darwin[cpu_AP27] x86_64-apple-darwin[cudaPPSsieve] + x86_64-apple-darwin[mt] x86_64-apple-darwin[OCLcudaGFN] x86_64-apple-darwin[OCLcudaGFN15] x86_64-apple-darwin[OCLcudaGFN16] @@ -778,6 +736,7 @@ x86_64-apple-darwin[OCLcudaGFN18] x86_64-apple-darwin[OCLcudaGFN19] x86_64-apple-darwin[OCLcudaGFN20] + x86_64-apple-darwin[OCLcudaGFNEXTREME] x86_64-apple-darwin[OCLcudaGFNWR] x86_64-apple-darwin[OCL_cuda_AP27] x86_64-apple-darwin[openclatiGFN15] @@ -789,19 +748,21 @@ x86_64-apple-darwin[openclatiGFN20] x86_64-apple-darwin[openclatiGFN21] x86_64-apple-darwin[openclatiGFN22] + x86_64-apple-darwin[openclatiGFNEXTREME] x86_64-apple-darwin[openclatiPPSsieve] x86_64-apple-darwin[opencl_ati_AP27] x86_64-pc-linux-gnu x86_64-pc-linux-gnu[cpuGFN16] x86_64-pc-linux-gnu[cpuGFN17LOW] - x86_64-pc-linux-gnu[cpuGFN17MEGA] x86_64-pc-linux-gnu[cpuGFN18] x86_64-pc-linux-gnu[cpuGFN19] x86_64-pc-linux-gnu[cpuGFN20] x86_64-pc-linux-gnu[cpuGFN21] + x86_64-pc-linux-gnu[cpuGFN22] x86_64-pc-linux-gnu[cpuPPSsieve] x86_64-pc-linux-gnu[cpu_AP27] x86_64-pc-linux-gnu[cudaPPSsieve] + x86_64-pc-linux-gnu[mt] x86_64-pc-linux-gnu[OCLcudaGFN] x86_64-pc-linux-gnu[OCLcudaGFN15] x86_64-pc-linux-gnu[OCLcudaGFN16] @@ -810,6 +771,7 @@ x86_64-pc-linux-gnu[OCLcudaGFN18] x86_64-pc-linux-gnu[OCLcudaGFN19] x86_64-pc-linux-gnu[OCLcudaGFN20] + x86_64-pc-linux-gnu[OCLcudaGFNEXTREME] x86_64-pc-linux-gnu[OCLcudaGFNWR] x86_64-pc-linux-gnu[OCL_cuda_AP27] x86_64-pc-linux-gnu[openclatiGFN15] @@ -821,6 +783,7 @@ x86_64-pc-linux-gnu[openclatiGFN20] x86_64-pc-linux-gnu[openclatiGFN21] x86_64-pc-linux-gnu[openclatiGFN22] + x86_64-pc-linux-gnu[openclatiGFNEXTREME] x86_64-pc-linux-gnu[openclatiPPSsieve] x86_64-pc-linux-gnu[opencl_ati_AP27] @@ -883,45 +846,30 @@ 15 32 - Distributed Hardware Evolution Project - 40 - https://dhep.ga/boinc/ - https://dhep.ga/boinc/ + RakeSearch + 42 + https://rake.boincfast.ru/rakesearch/ + https://rake.boincfast.ru/rakesearch/ Mathematics, computing, and games - Electrical Engineering - - University of Sussex + Mathematics + + Karelian Research Center, Russian Academy of Sciences + arm-unknown-linux-gnueabihf + e2k-linux-gnu + i686-pc-linux-gnu windows_intelx86 windows_x86_64 - x86_64-apple-darwin x86_64-pc-linux-gnu - https://boinc.berkeley.edu/images/dhep.png - Help design super-reliable electronic circuits - 15 20 48 - - - DBN Upper Bound - 41 - http://anthgrid.com/dbnupperbound/ - http://anthgrid.com/dbnupperbound/ - Mathematics, computing, and games - Mathematics - - Independent - - windows_x86_64[vbox64_mt] - x86_64-apple-darwin[vbox64_mt] - x86_64-pc-linux-gnu[vbox64_mt] - - 15 + Study Latin Squares + 15 20 44 Climateprediction.net 8 - http://www.cpdn.org/cpdnboinc/ - http://climateprediction.net/ + https://climateprediction.net/ + https://www.cpdn.org/ Earth Sciences Climate study @@ -930,6 +878,7 @@ i686-apple-darwin i686-pc-linux-gnu windows_intelx86 + x86_64-pc-linux-gnu https://boinc.berkeley.edu/images/cpn_logo_world_1.jpg Study long-term climate change @@ -1011,16 +960,32 @@ IBM Corporate Citizenship i686-pc-linux-gnu + x86_64-pc-linux-gnu windows_intelx86 windows_x86_64 x86_64-apple-darwin - x86_64-pc-linux-gnu arm-android-linux-gnu https://boinc.berkeley.edu/images/wcg.jpg Do biomedical and environmental research 9 29 23 24 + + BOINC@TACC + 44 + https://boinc.tacc.utexas.edu/ + https://boinc.tacc.utexas.edu/ + Multiple applications + Multiple scientific areas + + Texas Advanced Computing Center + + windows_x86_64[vbox64_mt] + x86_64-apple-darwin[vbox64_mt] + x86_64-pc-linux-gnu[vbox64_mt] + + 23 24 + MindModeling@Home 3 @@ -1101,4 +1066,11 @@ Science United is a simple and friendly interface to BOINC. You sign up for science areas instead of projects. https://boinc.berkeley.edu/images/ + + GRCPool + 45 + https://grcpool.com + GRCPool.com is a cryptocurrency mining pool which rewards work performed using BOINC. + https://boinc.berkeley.edu/images/ + From 3f0d305fda8bf4f93ff48193f1edc96f6b949783 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 4 Feb 2020 14:08:03 -0800 Subject: [PATCH 2/3] Add server version to version.h, and have scheduler report server version. Previously it was reporting client version. --- html/inc/server_version.inc | 2 ++ sched/sched_types.cpp | 2 +- version.h | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/html/inc/server_version.inc b/html/inc/server_version.inc index 98e56f9f536..6fc68000b33 100644 --- a/html/inc/server_version.inc +++ b/html/inc/server_version.inc @@ -3,6 +3,8 @@ // the server code release number (major/minor/release). // Update this when you do a server release. +// This should agree with version.h + // public releases have even minor #, // and are assumed to have a branch on github. // dev versions (e.g. master) have an odd minor # diff --git a/sched/sched_types.cpp b/sched/sched_types.cpp index f0364018376..65d73fed8d6 100644 --- a/sched/sched_types.cpp +++ b/sched/sched_types.cpp @@ -766,7 +766,7 @@ int SCHEDULER_REPLY::write(FILE* fout, SCHEDULER_REQUEST& sreq) { "Content-type: text/xml\n\n" "\n" "%d\n", - BOINC_MAJOR_VERSION*100+BOINC_MINOR_VERSION + SERVER_MAJOR_VERSION*100+SERVER_MINOR_VERSION ); if (sreq.core_client_version >= 70028) { fprintf(fout, "\n"); diff --git a/version.h b/version.h index 9ec61e773c4..50e751b670c 100644 --- a/version.h +++ b/version.h @@ -3,24 +3,24 @@ #ifndef BOINC_VERSION_H #define BOINC_VERSION_H -/* Major part of BOINC version number */ +/* client version number */ #define BOINC_MAJOR_VERSION 7 - -/* Minor part of BOINC version number */ #define BOINC_MINOR_VERSION 17 - -/* Release part of BOINC version number */ #define BOINC_RELEASE 0 +#define BOINC_VERSION_STRING "7.17.0" -/* Release part of wrapper version number */ +/* server version: must match html/inc/server_version.inc */ +#define SERVER_MAJOR_VERSION 1 +#define SERVER_MINOR_VERSION 1 +#define SERVER_RELEASE 0 +#define SERVER_VERSION_STRING "1.1.0" + +/* wrapper version number */ #define WRAPPER_RELEASE 26016 -/* Release part of vboxwrapper version number */ +/* vboxwrapper version number */ #define VBOXWRAPPER_RELEASE 26202 -/* String representation of BOINC version number */ -#define BOINC_VERSION_STRING "7.17.0" - /* Package is a pre-release (Alpha/Beta) package */ #define BOINC_PRERELEASE 1 From 982d36a9dd890df07496852d6af2858a59ef8929 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 4 Feb 2020 23:49:21 -0800 Subject: [PATCH 3/3] server: build fix --- sched/sched_types.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sched/sched_types.cpp b/sched/sched_types.cpp index 65d73fed8d6..069c6bc2401 100644 --- a/sched/sched_types.cpp +++ b/sched/sched_types.cpp @@ -24,6 +24,7 @@ #include #include +#include "version.h" #include "parse.h" #include "error_numbers.h" #include "str_util.h"