Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id A858A7A16D for ; Sat, 1 Oct 2016 13:04:18 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5D1A985EDD; Sat, 1 Oct 2016 13:04:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E204385EB5 for ; Sat, 1 Oct 2016 13:04:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id YUz9rCd_shl9 for ; Sat, 1 Oct 2016 13:04:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2130E85E47 for ; Sat, 1 Oct 2016 13:04:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1F315FBD2; Sat, 1 Oct 2016 13:04:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1475327057234960" MIME-Version: 1.0 Date: Sat, 1 Oct 2016 13:04:17 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/math/vowpal_wabbit To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20161001130417.1F315FBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1475327057234960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Sat Oct 1 13:04:17 UTC 2016 Modified Files: pkgsrc/math/vowpal_wabbit: distinfo Added Files: pkgsrc/math/vowpal_wabbit/patches: patch-vowpalwabbit_accumulate.cc patch-vowpalwabbit_allreduce__sockets.cc patch-vowpalwabbit_bfgs.cc patch-vowpalwabbit_main.cc Log Message: Don't depend on outdated ftime interface. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/vowpal_wabbit/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_accumulate.cc \ pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_allreduce__sockets.cc \ pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_bfgs.cc \ pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_main.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1475327057234960 Content-Disposition: inline Content-Length: 9167 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/vowpal_wabbit/distinfo diff -u pkgsrc/math/vowpal_wabbit/distinfo:1.2 pkgsrc/math/vowpal_wabbit/distinfo:1.3 --- pkgsrc/math/vowpal_wabbit/distinfo:1.2 Sun Sep 18 07:08:19 2016 +++ pkgsrc/math/vowpal_wabbit/distinfo Sat Oct 1 13:04:16 2016 @@ -1,8 +1,12 @@ -$NetBSD: distinfo,v 1.2 2016/09/18 07:08:19 dholland Exp $ +$NetBSD: distinfo,v 1.3 2016/10/01 13:04:16 joerg Exp $ SHA1 (vowpal_wabbit-8.2.0.tar.gz) = 7fd516e1ff16ac03fd389b59abaf462f6fca61cb RMD160 (vowpal_wabbit-8.2.0.tar.gz) = a2e91b3f6d0f2b50f8cef382ce1995016ff074e0 SHA512 (vowpal_wabbit-8.2.0.tar.gz) = 7f352c7d899e1068969ecf10931ce59efaedb5ffb91277958e96b1c705cb9f9da7397dcded42e101ba98412124e2662ca5cf71b368ab7d80ce7afe650cdd59c6 Size (vowpal_wabbit-8.2.0.tar.gz) = 13391191 bytes +SHA1 (patch-vowpalwabbit_accumulate.cc) = 605cb7e6d1bf1efe0051c4a35a609b277b4f7f4d +SHA1 (patch-vowpalwabbit_allreduce__sockets.cc) = d412ecea83a70af56d08752fb5f99675dd6fd0e4 +SHA1 (patch-vowpalwabbit_bfgs.cc) = 4e1532fd3fd7b3ccf37480a2b443309e0c7ff797 +SHA1 (patch-vowpalwabbit_main.cc) = 46bdcaca26ea4635ab0b5c361227fe907e3fbfd9 SHA1 (patch-vowpalwabbit_parser.cc) = 1ea77e94b53ec7a24b5fabbd9e05cb9b47ac6707 SHA1 (patch-vowpalwabbit_sender.cc) = 796daf462f50d9d2b7a90d6a032cbf69f7a3a374 Added files: Index: pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_accumulate.cc diff -u /dev/null pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_accumulate.cc:1.1 --- /dev/null Sat Oct 1 13:04:17 2016 +++ pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_accumulate.cc Sat Oct 1 13:04:16 2016 @@ -0,0 +1,12 @@ +$NetBSD: patch-vowpalwabbit_accumulate.cc,v 1.1 2016/10/01 13:04:16 joerg Exp $ + +--- vowpalwabbit/accumulate.cc.orig 2016-09-30 09:24:37.000000000 +0000 ++++ vowpalwabbit/accumulate.cc +@@ -9,7 +9,6 @@ Alekh Agarwal and John Langford, with he + */ + + #include +-#include + #include + #include + #include "global_data.h" Index: pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_allreduce__sockets.cc diff -u /dev/null pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_allreduce__sockets.cc:1.1 --- /dev/null Sat Oct 1 13:04:17 2016 +++ pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_allreduce__sockets.cc Sat Oct 1 13:04:16 2016 @@ -0,0 +1,12 @@ +$NetBSD: patch-vowpalwabbit_allreduce__sockets.cc,v 1.1 2016/10/01 13:04:16 joerg Exp $ + +--- vowpalwabbit/allreduce_sockets.cc.orig 2016-09-30 09:24:32.000000000 +0000 ++++ vowpalwabbit/allreduce_sockets.cc +@@ -24,7 +24,6 @@ Alekh Agarwal and John Langford, with he + #include + #include + #endif +-#include + #include "allreduce.h" + #include "vw_exception.h" + Index: pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_bfgs.cc diff -u /dev/null pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_bfgs.cc:1.1 --- /dev/null Sat Oct 1 13:04:17 2016 +++ pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_bfgs.cc Sat Oct 1 13:04:16 2016 @@ -0,0 +1,90 @@ +$NetBSD: patch-vowpalwabbit_bfgs.cc,v 1.1 2016/10/01 13:04:16 joerg Exp $ + +--- vowpalwabbit/bfgs.cc.orig 2016-09-30 09:20:08.000000000 +0000 ++++ vowpalwabbit/bfgs.cc +@@ -15,7 +15,7 @@ Implementation by Miro Dudik. + #include + #include + #include +-#include ++#include + #include "accumulate.h" + #include "gd.h" + #include "vw_exception.h" +@@ -62,10 +62,10 @@ struct bfgs + double wolfe1_bound; + + size_t final_pass; +- struct timeb t_start, t_end; ++ struct timeval t_start, t_end; + double net_comm_time; + +- struct timeb t_start_global, t_end_global; ++ struct timeval t_start_global, t_end_global; + double net_time; + + v_array predictions; +@@ -553,8 +553,8 @@ int process_pass(vw& all, bfgs& b) + else + { b.step_size = 0.5; + float d_mag = direction_magnitude(all); +- ftime(&b.t_end_global); +- b.net_time = (int) (1000.0 * (b.t_end_global.time - b.t_start_global.time) + (b.t_end_global.millitm - b.t_start_global.millitm)); ++ gettimeofday(&b.t_end_global, NULL); ++ b.net_time = (int) (1000.0 * (b.t_end_global.tv_sec - b.t_start_global.tv_sec) + 0.001 * (b.t_end_global.tv_usec - b.t_start_global.tv_usec)); + if (!all.quiet) + fprintf(stderr, "%-10s\t%-10.5f\t%-10.5f\n", "", d_mag, b.step_size); + b.predictions.erase(); +@@ -602,8 +602,8 @@ int process_pass(vw& all, bfgs& b) + /********************************************************************/ + else if (b.backstep_on && (wolfe1 b.previous_loss_sum)) + { // curvature violated, or we stepped too far last time: step back +- ftime(&b.t_end_global); +- b.net_time = (int) (1000.0 * (b.t_end_global.time - b.t_start_global.time) + (b.t_end_global.millitm - b.t_start_global.millitm)); ++ gettimeofday(&b.t_end_global, NULL); ++ b.net_time = (int) (1000.0 * (b.t_end_global.tv_sec - b.t_start_global.tv_sec) + 0.001 * (b.t_end_global.tv_usec - b.t_start_global.tv_usec)); + float ratio = (b.step_size==0.f) ? 0.f : (float)new_step/(float)b.step_size; + if (!all.quiet) + fprintf(stderr, "%-10s\t%-10s\t(revise x %.1f)\t%-10.5f\n", +@@ -647,8 +647,8 @@ int process_pass(vw& all, bfgs& b) + } + else + { float d_mag = direction_magnitude(all); +- ftime(&b.t_end_global); +- b.net_time = (int) (1000.0 * (b.t_end_global.time - b.t_start_global.time) + (b.t_end_global.millitm - b.t_start_global.millitm)); ++ gettimeofday(&b.t_end_global, NULL); ++ b.net_time = (int) (1000.0 * (b.t_end_global.tv_sec - b.t_start_global.tv_sec) + 0.001 * (b.t_end_global.tv_usec - b.t_start_global.tv_usec)); + if (!all.quiet) + fprintf(stderr, "%-10s\t%-10.5f\t%-10.5f\n", "", d_mag, b.step_size); + b.predictions.erase(); +@@ -685,8 +685,8 @@ int process_pass(vw& all, bfgs& b) + + b.predictions.erase(); + update_weight(all, b.step_size); +- ftime(&b.t_end_global); +- b.net_time = (int) (1000.0 * (b.t_end_global.time - b.t_start_global.time) + (b.t_end_global.millitm - b.t_start_global.millitm)); ++ gettimeofday(&b.t_end_global, NULL); ++ b.net_time = (int) (1000.0 * (b.t_end_global.tv_sec - b.t_start_global.tv_sec) + 0.001 * (b.t_end_global.tv_usec - b.t_start_global.tv_usec)); + if (!all.quiet) + fprintf(stderr, "%-10.5f\t%-10.5f\t%-10.5f\n", b.curvature / b.importance_weight_sum, d_mag, b.step_size); + b.gradient_pass = true; +@@ -700,8 +700,8 @@ int process_pass(vw& all, bfgs& b) + accumulate(all, all.reg, W_COND); //Accumulate preconditioner + //preconditioner_to_regularizer(all, b, all.l2_lambda); + } +- ftime(&b.t_end_global); +- b.net_time = (int) (1000.0 * (b.t_end_global.time - b.t_start_global.time) + (b.t_end_global.millitm - b.t_start_global.millitm)); ++ gettimeofday(&b.t_end_global, NULL); ++ b.net_time = (int) (1000.0 * (b.t_end_global.tv_sec - b.t_start_global.tv_sec) + 0.001 * (b.t_end_global.tv_usec - b.t_start_global.tv_usec)); + + if (all.save_per_pass) + save_predictor(all, all.final_regressor_name, b.current_pass); +@@ -883,7 +883,7 @@ void save_load(bfgs& b, io_buf& model_fi + } + + b.net_time = 0.0; +- ftime(&b.t_start_global); ++ gettimeofday(&b.t_start_global, NULL); + + if (!all->quiet) + { const char * header_fmt = "%2s %-10s\t%-10s\t%-10s\t %-10s\t%-10s\t%-10s\t%-10s\t%-10s\t%-10s\n"; Index: pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_main.cc diff -u /dev/null pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_main.cc:1.1 --- /dev/null Sat Oct 1 13:04:17 2016 +++ pkgsrc/math/vowpal_wabbit/patches/patch-vowpalwabbit_main.cc Sat Oct 1 13:04:16 2016 @@ -0,0 +1,38 @@ +$NetBSD: patch-vowpalwabbit_main.cc,v 1.1 2016/10/01 13:04:16 joerg Exp $ + +--- vowpalwabbit/main.cc.orig 2016-09-30 09:21:08.000000000 +0000 ++++ vowpalwabbit/main.cc +@@ -9,7 +9,7 @@ license as described in the file LICENSE + #include + #include + #endif +-#include ++#include + #include "parse_args.h" + #include "parse_regressor.h" + #include "accumulate.h" +@@ -91,8 +91,8 @@ int main(int argc, char *argv[]) + + vw& all = *alls[0]; + +- struct timeb t_start, t_end; +- ftime(&t_start); ++ struct timeval t_start, t_end; ++ gettimeofday(&t_start, NULL); + + VW::start_parser(all); + if (alls.size() == 1) +@@ -102,10 +102,10 @@ int main(int argc, char *argv[]) + + VW::end_parser(all); + +- ftime(&t_end); +- double net_time = (int) (1000.0 * (t_end.time - t_start.time) + (t_end.millitm - t_start.millitm)); ++ gettimeofday(&t_end, NULL); ++ double net_time = (t_end.tv_sec - t_start.tv_sec) + (t_end.tv_usec - t_start.tv_usec) * 0.000001; + if(!all.quiet && all.all_reduce != nullptr) +- cerr<<"Net time taken by process = "<