Revision 1172

branches/threaded2merge/tests/GNUmakefile (revision 1172)
2 2

  
3 3
GTEST_DIR=googletest-read-only
4 4

  
5
all: test-expm test-cov_re gtests test-threads
5
all: test-threads
6 6

  
7 7
gtests: $(GTEST_DIR)/gtest-all.o
8 8
	$(MAKE) --directory=gtests
......
17 17
	svn checkout http://googletest.googlecode.com/svn/trunk/ googletest-read-only
18 18

  
19 19
test-threads:
20
	$(MAKE) --directory=threads clean
20 21
	$(MAKE) --directory=threads
21 22

  
22 23
svn: svn-geolocation
branches/threaded2merge/src/GNUmakefile (revision 1172)
422 422

  
423 423
tests:
424 424
ifndef USE_ADMB_HOME
425
	$(MAKE) ADMB_HOME="${PWD}/${DISK}" --directory=../contrib test
425
	@#$(MAKE) ADMB_HOME="${PWD}/${DISK}" --directory=../contrib test
426 426
	$(MAKE) ADMB_HOME="${PWD}/${DISK}" --directory=../tests
427 427
else
428
	$(MAKE) ADMB_HOME="${ADMB_HOME}" --directory=../contrib test
428
	@#$(MAKE) ADMB_HOME="${ADMB_HOME}" --directory=../contrib test
429 429
	$(MAKE) ADMB_HOME="${ADMB_HOME}" --directory=../tests
430 430
endif
431 431

  
branches/threaded2merge/src/linad99/gradstrc.cpp (revision 1172)
68 68
// *************************************************************
69 69
// *************************************************************
70 70
int ctlc_flag = 0;
71
int gradient_structure::Hybrid_bounded_flag=0;
72
DF_FILE * gradient_structure::fp=NULL;
73
char gradient_structure::cmpdif_file_name[61];
71
__thread int gradient_structure::Hybrid_bounded_flag = 0;
72
__thread DF_FILE* gradient_structure::fp = NULL;
73
__thread char gradient_structure::cmpdif_file_name[61];
74 74
//char gradient_structure::var_store_file_name[61];
75 75
int gradient_structure::NUM_RETURN_ARRAYS = 25;
76
double * gradient_structure::hessian_ptr=NULL;
76
__thread double* gradient_structure::hessian_ptr = NULL;
77 77
int gradient_structure::NUM_DEPENDENT_VARIABLES = 2000;
78 78
#if (defined(NO_DERIVS))
79 79
  int gradient_structure::no_derivatives = 0;
80 80
#endif
81
long int gradient_structure::max_last_offset = 0;
82
long int gradient_structure::NVAR = 0;
83
long int gradient_structure::TOTAL_BYTES = 0;
84
long int gradient_structure::PREVIOUS_TOTAL_BYTES = 0;
81
__thread long int gradient_structure::max_last_offset = 0;
82
__thread long int gradient_structure::NVAR = 0;
83
__thread long int gradient_structure::TOTAL_BYTES = 0;
84
__thread long int gradient_structure::PREVIOUS_TOTAL_BYTES = 0;
85 85
long int gradient_structure::USE_FOR_HESSIAN = 0;
86
dvariable** gradient_structure::RETURN_ARRAYS = NULL;
87
int gradient_structure::RETURN_ARRAYS_PTR;
88
dvariable ** gradient_structure::RETURN_PTR_CONTAINER = NULL;
89
int gradient_structure::RETURN_ARRAYS_SIZE = 70;
90
int gradient_structure::instances = 0;
86
__thread dvariable** gradient_structure::RETURN_ARRAYS = NULL;
87
__thread int gradient_structure::RETURN_ARRAYS_PTR = 0;
88
__thread dvariable** gradient_structure::RETURN_PTR_CONTAINER = NULL;
89
__thread int gradient_structure::RETURN_ARRAYS_SIZE = 70;
90
__thread int gradient_structure::instances = 0;
91 91
//int gradient_structure::RETURN_INDEX = 0;
92 92
//dvariable * gradient_structure::FRETURN = NULL;
93
dvariable * gradient_structure::MAX_RETURN = NULL;
94
dvariable * gradient_structure::MIN_RETURN = NULL;
95
dvariable * gradient_structure::RETURN_PTR = NULL;
93
__thread dvariable* gradient_structure::MAX_RETURN = NULL;
94
__thread dvariable* gradient_structure::MIN_RETURN = NULL;
95
__thread dvariable* gradient_structure::RETURN_PTR = NULL;
96 96
#ifdef __BORLANDC__
97
long int gradient_structure::GRADSTACK_BUFFER_SIZE = 4000000L;
98
long int gradient_structure::CMPDIF_BUFFER_SIZE=140000000L;
97
__thread long int gradient_structure::GRADSTACK_BUFFER_SIZE = 4000000L;
98
__thread long int gradient_structure::CMPDIF_BUFFER_SIZE = 140000000L;
99 99
#else
100
long long int gradient_structure::GRADSTACK_BUFFER_SIZE = 4000000L;
101
long long int gradient_structure::CMPDIF_BUFFER_SIZE=140000000L;
100
__thread long long int gradient_structure::GRADSTACK_BUFFER_SIZE = 4000000L;
101
__thread long long int gradient_structure::CMPDIF_BUFFER_SIZE = 140000000L;
102 102
#endif
103
__thread dependent_variables_information * gradient_structure::DEPVARS_INFO = NULL;
103 104

  
104
dependent_variables_information * gradient_structure::DEPVARS_INFO=NULL;
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff