diff --git a/checkin_notes b/checkin_notes index 3704247ee1..45c8d85a7d 100644 --- a/checkin_notes +++ b/checkin_notes @@ -237,3 +237,18 @@ Charlie 8 Jan 2010 AdvancedFrame.cpp BOINCBaseFrame.cpp, .h MainDocument.cpp, .h + +David 9 Jan 2010 + - client (Mac): append /usr/local/cuda/lib to LD_LIBRARY_PATH + and DYLD_LIBRARY_PATH + - client simulator: compile fixes + + client/ + app.cpp + app_start.cpp + client_state.h + cs_apps.cpp + rr_sim.cpp + sim.cpp,h + time_stats.cpp + work_fetch.cpp diff --git a/client/app.cpp b/client/app.cpp index 6bdd9343b3..29470cce56 100644 --- a/client/app.cpp +++ b/client/app.cpp @@ -54,12 +54,7 @@ #endif -#ifdef SIM -#include "sim.h" -#else #include "client_state.h" -#include "client_types.h" -#endif #include "error_numbers.h" #include "filesys.h" diff --git a/client/app_start.cpp b/client/app_start.cpp index 0742a9e03d..6f73b6108b 100644 --- a/client/app_start.cpp +++ b/client/app_start.cpp @@ -799,16 +799,22 @@ int ACTIVE_TASK::start(bool first_time) { // - the project dir (../../projects/X) // - the slot dir (.) // - the BOINC dir (../..) + // (Mac) /usr/local/cuda/lib/ // We use relative paths in case higher-level dirs // are not readable to the account under which app runs // char libpath[8192]; + char newlibs[256]; get_project_dir(wup->project, buf, sizeof(buf)); + sprintf(newlibs, "../../%s:.:../..", buf); +#ifdef __APPLE__ + strcat(newlibs, ":/usr/local/cuda/lib/"); +#endif char* p = getenv("LD_LIBRARY_PATH"); if (p) { - sprintf(libpath, "../../%s:.:../..:%s", buf, p); + sprintf(libpath, "%s:%s", newlibs, p); } else { - sprintf(libpath, "../../%s:.:../..", buf); + strcpy(libpath, newlibs); } setenv("LD_LIBRARY_PATH", libpath, 1); @@ -817,9 +823,9 @@ int ACTIVE_TASK::start(bool first_time) { #ifdef __APPLE__ p = getenv("DYLD_LIBRARY_PATH"); if (p) { - sprintf(libpath, "../../%s:.:../..:%s", buf, p); + sprintf(libpath, "%s:%s", newlibs, p); } else { - sprintf(libpath, "../../%s:.:../..", buf); + strcpy(libpath, newlibs); } setenv("DYLD_LIBRARY_PATH", libpath, 1); #endif diff --git a/client/client_state.h b/client/client_state.h index b320d98f57..3d151ad980 100644 --- a/client/client_state.h +++ b/client/client_state.h @@ -18,6 +18,10 @@ #ifndef _CLIENT_STATE_ #define _CLIENT_STATE_ +#ifdef SIM +#include "sim.h" +#else + #ifndef _WIN32 #include #include @@ -539,3 +543,4 @@ extern void print_suspend_tasks_message(int); // maximum short-term debt #endif +#endif diff --git a/client/cs_apps.cpp b/client/cs_apps.cpp index 029f48f7a6..3775fbee6c 100644 --- a/client/cs_apps.cpp +++ b/client/cs_apps.cpp @@ -39,11 +39,7 @@ #include "shmem.h" #include "log_flags.h" #include "client_msgs.h" -#ifdef SIM -#include "sim.h" -#else #include "client_state.h" -#endif using std::vector; diff --git a/client/rr_sim.cpp b/client/rr_sim.cpp index ab5c590522..250a351b14 100644 --- a/client/rr_sim.cpp +++ b/client/rr_sim.cpp @@ -42,11 +42,7 @@ #include "boinc_win.h" #endif -#ifdef SIM -#include "sim.h" -#else #include "client_state.h" -#endif #include "coproc.h" #include "client_msgs.h" diff --git a/client/sim.cpp b/client/sim.cpp index 2cf4a8823d..7eb0e72d22 100644 --- a/client/sim.cpp +++ b/client/sim.cpp @@ -644,6 +644,10 @@ int main(int argc, char** argv) { vector dirs; logfile = fopen("sim_log.txt", "w"); + if (!logfile) { + fprintf(stderr, "Can't open sim_log.txt\n"); + exit(1); + } sim_results.clear(); for (i=1; i - + "; diff --git a/doc/download.php b/doc/download.php index a44f6294e3..9dcd7f938e 100644 --- a/doc/download.php +++ b/doc/download.php @@ -114,7 +114,7 @@ function show_download($pname) { " .sprintf( tra("Note: if your computer is equipped with an Graphics Processing Unit (GPU), you may be able to %suse it to compute faster%s"), - "", "." + "", "." ) ."

diff --git a/doc/download_all.php b/doc/download_all.php index 2a6311d152..715fc8be98 100644 --- a/doc/download_all.php +++ b/doc/download_all.php @@ -195,7 +195,7 @@ if ($xml) {

GPU computing

If your computer is equipped with a Graphics Processing Unit (GPU), you may be able to - use it to compute faster. + use it to compute faster.

Other platforms

If your computer is not of one of these types, you can
    diff --git a/doc/gpu.php b/doc/gpu.php index 21d6e14d4f..45eaf36116 100644 --- a/doc/gpu.php +++ b/doc/gpu.php @@ -5,6 +5,11 @@ require_once("docutil.php"); page_head("Use your GPU for scientific computing"); echo " + +THIS PAGE IS DEPRECATED: USE +http://boinc.berkeley.edu/wiki/GPU_computing +instead +

    Most computers are equipped with a Graphics Processing Unit (GPU) @@ -33,7 +38,7 @@ If your GPU is listed here and has at least 256MB of RAM, it's compatible. R600 and newer GPUs are found with ATI Radeon HD2400, HD2600, HD2900 and HD3800 graphics board. A full list is -here. +here.

2) Get the latest BOINC software

@@ -49,6 +54,8 @@ Otherwise diff --git a/doc/index.php b/doc/index.php index dbcac7bf9d..95540dac5c 100644 --- a/doc/index.php +++ b/doc/index.php @@ -154,6 +154,7 @@ function show_other() {
  • ".tra("Translation")."
  • ".tra("Testing")."
  • ".tra("Documentation")." +
  • ".tra("Publicity")."
  • ".tra("Software development")."
  • ".tra("APIs for add-on software")." @@ -245,7 +246,7 @@ echo " ".sprintf(tra("Open-source software for %svolunteer computing%s and %sgrid computing%s."), '', '', '', '')." - +

    "; language_form(); @@ -253,7 +254,16 @@ echo ""; search_form(); echo "
    - + + +
    + + \"The + + +
    + +
    diff --git a/doc/projects.php b/doc/projects.php index c8536d37de..646b3ee691 100644 --- a/doc/projects.php +++ b/doc/projects.php @@ -39,7 +39,7 @@ See also

    Note: if your computer is equipped with a Graphics Processing Unit (GPU), you may be able to -use it to compute faster. +use it to compute faster. "; list_start("cellpadding=2 width=100%"); list_heading(