diff options
author | John Langford <jl@hunch.net> | 2015-01-04 04:45:55 +0300 |
---|---|---|
committer | John Langford <jl@hunch.net> | 2015-01-04 04:45:55 +0300 |
commit | b913d178acb0052f4bb9622dd253a4ddc684a4ce (patch) | |
tree | 2a7c6348009dea6ee77caf67af897473fb2b77aa /vowpalwabbit | |
parent | 00ce5188f90cc426493872e8d630b6c61f99df79 (diff) | |
parent | ed8c4d38aba3b49159f1b2574028b5cbae96a7f2 (diff) |
resolve conflicts
Diffstat (limited to 'vowpalwabbit')
-rw-r--r-- | vowpalwabbit/Makefile | 1 | ||||
-rw-r--r-- | vowpalwabbit/accumulate.h | 26 |
2 files changed, 14 insertions, 13 deletions
diff --git a/vowpalwabbit/Makefile b/vowpalwabbit/Makefile index 79893902..9ecd681c 100644 --- a/vowpalwabbit/Makefile +++ b/vowpalwabbit/Makefile @@ -52,3 +52,4 @@ install: $(BINARIES) clean: rm -f *.o *.d $(BINARIES) *~ $(MANPAGES) libvw.a +.PHONY: all clean install test things diff --git a/vowpalwabbit/accumulate.h b/vowpalwabbit/accumulate.h index c01ac5fe..4d507a60 100644 --- a/vowpalwabbit/accumulate.h +++ b/vowpalwabbit/accumulate.h @@ -1,13 +1,13 @@ -/*
-Copyright (c) by respective owners including Yahoo!, Microsoft, and
-individual contributors. All rights reserved. Released under a BSD
-license as described in the file LICENSE.
- */
-//This implements various accumulate functions building on top of allreduce.
-#pragma once
-#include "global_data.h"
-
-void accumulate(vw& all, std::string master_location, regressor& reg, size_t o);
-float accumulate_scalar(vw& all, std::string master_location, float local_sum);
-void accumulate_weighted_avg(vw& all, std::string master_location, regressor& reg);
-void accumulate_avg(vw& all, std::string master_location, regressor& reg, size_t o);
+/* +Copyright (c) by respective owners including Yahoo!, Microsoft, and +individual contributors. All rights reserved. Released under a BSD +license as described in the file LICENSE. + */ +//This implements various accumulate functions building on top of allreduce. +#pragma once +#include "global_data.h" + +void accumulate(vw& all, std::string master_location, regressor& reg, size_t o); +float accumulate_scalar(vw& all, std::string master_location, float local_sum); +void accumulate_weighted_avg(vw& all, std::string master_location, regressor& reg); +void accumulate_avg(vw& all, std::string master_location, regressor& reg, size_t o); |