Revision 752

branches/threaded2/Makefile (revision 752)
42 42
linux: linux-admb linux-contrib
43 43

  
44 44
linux-admb:
45
	$(MAKE) --directory=src --file=linux.mak
45
	$(MAKE) DEBUG=1 --directory=src --file=linux.mak
46 46

  
47 47
linux-64bit: linux-contrib
48 48
	CXXFLAGS=-m64 $(MAKE) --directory=src --file=linux.mak dist-64bit
......
51 51
	CC=gcc CXX=g++ CXXFLAGS="" LIBPATH=../build/gcc411-fedora8 DISK=../build/dists/admb_gcc411_fedora8 $(MAKE) --directory=contrib
52 52

  
53 53
linux-verify:
54
	$(MAKE) --directory=src --file=linux.mak verify
54
	$(MAKE) DEBUG=1 --directory=src --file=linux.mak verify
55 55

  
56 56
it:
57 57
	./configure CFLAGS=-m32 CXXFLAGS="-m32 -mmacosx-version-min=10.5" LDFLAGS="-m32"
branches/threaded2/tests/threaded_hessian_routine/function_minimizer-hess_routine_threaded.cpp (revision 752)
19 19

  
20 20
void function_minimizer::hess_routine_threaded(void)
21 21
{
22

  
22 23
  int nvar=initial_params::nvarcalc(); // get the number of active parameters
23 24
  //if (adjm_ptr) set_labels_for_hess(nvar);
24 25
  independent_variables x(1,nvar);
......
35 36
  gradient_structure::set_YES_DERIVATIVES();
36 37
  gbest.fill_seqadd(1.e+50,0.);
37 38

  
39
/*
38 40
  adstring tmpstring="admodel.hes-threaded";
39 41
  if (ad_comm::wd_flag)
40 42
     tmpstring = ad_comm::adprogram_name + ".hes-threaded";
41 43
  uostream ofs((char*)tmpstring);
42 44

  
43 45
  ofs << nvar;
46
*/
47
      dvariable vf;
48
if (true) return;
44 49
  {
45 50
    {
46 51
      dvariable vf=0.0;
52
if (true) return;
47 53
      vf=initial_params::reset(dvar_vector(x));
48 54
      *objective_function_value::pobjfun=0.0;
49 55
      pre_userfunction();
......
118 124
      hess2=(g1-g2)/(sdelta1-sdelta2);
119 125
      hess=(eps2*hess1-hess2) /(eps2-1.);
120 126

  
127
/*
121 128
      ofs << hess;
122 129
      //if (adjm_ptr) ad_update_hess_stats_report(nvar,i);
130
*/
123 131
    }
124 132
  }
133
/*
125 134
  ofs << gradient_structure::Hybrid_bounded_flag;
126 135
  dvector tscale(1,nvar);   // need to get scale from somewhere
127
  /*int check=*/initial_params::stddev_scale(tscale,x);
136
  initial_params::stddev_scale(tscale,x);
128 137
  ofs << tscale;
138
*/
129 139
}
branches/threaded2/tests/threaded_hessian_routine/tests_threaded_hessian_routine.cpp (revision 752)
1 1
#include <iostream>
2
#include <vector>
2 3
#include <thread>
4
using std::vector;
5
using std::thread;
6

  
3 7
#include <gtest/gtest.h>
4 8

  
5 9
#define main simple
......
17 21
  }
18 22
  virtual void TearDown() {
19 23
  }
24
public:
25
  static __thread int line;
26
  static __thread dvariable* variable;
20 27
};
28
__thread int tests_threaded::line = -1;
29
__thread dvariable* tests_threaded::variable = nullptr;
21 30

  
22 31
int simple(int argc, char* argv[]);
32
void hello_world()
33
{
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff