File: norsnet.patch

package info (click to toggle)
profnet 1.0.21-1%2Bwheezy1
  • links: PTS, VCS
  • area: main
  • in suites: wheezy
  • size: 2,004 kB
  • sloc: fortran: 12,103; makefile: 233; perl: 124; csh: 6
file content (135 lines) | stat: -rw-r--r-- 6,039 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
diff -ruN -x '.*.swp' -x 'profnet*' -x .svn src/Makefile norsnet_dir/Makefile
--- src/Makefile	2010-02-10 17:55:33.923514458 +0100
+++ norsnet_dir/Makefile	2010-02-23 10:38:31.339646898 +0100
@@ -1,9 +1,9 @@
 #=====================================================================
 F77			=	gfortran
-BIN			=	profnet_prof
+BIN			=	profnet_norsnet
 #=====================================================================
 ARCH			=	LINUX
-FFLAGS          	:= 	-O3 -fbounds-check -Wuninitialized
+FFLAGS          	:= 	-O3 -Wuninitialized
 FFLAGS          	:= 	$(FFLAGS) -Wall -Wno-unused
 #=====================================================================
 NN_OBJS			:= prof.f lib-prof.f lib-sys-$(ARCH).f
diff -ruN -x '.*.swp' -x 'profnet*' -x .svn src/prof.f norsnet_dir/prof.f
--- src/prof.f	2010-02-11 12:59:41.891647105 +0100
+++ norsnet_dir/prof.f	2010-02-23 10:38:31.371648007 +0100
@@ -1850,45 +1850,45 @@
 C---- interpret
       IF     (HC(1:5) .EQ.'NUMIN') THEN
          NUMIN=VARIN
-         CALL RDPAR_ERR('NUMIN ',VARIN)
+         CALL RDPAR_ERR('NUMIN',VARIN)
       ELSEIF (HC(1:6) .EQ.'NUMHID') THEN
          NUMHID=VARIN
-         CALL RDPAR_ERR('NUMHID ',VARIN)
+         CALL RDPAR_ERR('NUMHID',VARIN)
       ELSEIF (HC(1:6) .EQ.'NUMOUT') THEN
          NUMOUT=VARIN
-         CALL RDPAR_ERR('NUMOUT ',VARIN)
+         CALL RDPAR_ERR('NUMOUT',VARIN)
       ELSEIF (HC(1:9) .EQ.'NUMLAYERS') THEN
          NUMLAYERS=VARIN
       ELSEIF (HC(1:6) .EQ.'NUMSAM') THEN
          NUMSAM=VARIN
-         CALL RDPAR_ERR('NUMSAM ',VARIN)
+         CALL RDPAR_ERR('NUMSAM',VARIN)
 C---- 
 C---- number of files
 C---- 
       ELSEIF (HC(1:12).EQ.'NUMFILEIN_IN') THEN
          NUMFILEIN_IN=VARIN
-         CALL RDPAR_ERR(HC // ' ',VARIN)
+         CALL RDPAR_ERR(HC,VARIN)
       ELSEIF (HC(1:13).EQ.'NUMFILEIN_OUT') THEN
          NUMFILEIN_OUT=VARIN
-         CALL RDPAR_ERR(HC // ' ',VARIN)
+         CALL RDPAR_ERR(HC,VARIN)
       ELSEIF (HC(1:14).EQ.'NUMFILEOUT_OUT') THEN
          NUMFILEOUT_OUT=VARIN
-         CALL RDPAR_ERR(HC // ' ',VARIN)
+         CALL RDPAR_ERR(HC,VARIN)
       ELSEIF (HC(1:14).EQ.'NUMFILEOUT_JCT') THEN
          NUMFILEOUT_JCT=VARIN
-         CALL RDPAR_ERR(HC // ' ',VARIN)
+         CALL RDPAR_ERR(HC,VARIN)
 C---- 
 C---- training times
 C---- 
       ELSEIF (HC(1:9) .EQ.'STPSWPMAX') THEN
          STPSWPMAX=VARIN
-         CALL RDPAR_ERR('STPSWPMAX ',VARIN)
+         CALL RDPAR_ERR('STPSWPMAX',VARIN)
       ELSEIF (HC(1:6) .EQ.'STPMAX') THEN
          STPMAX=VARIN
-         CALL RDPAR_ERR('STPMAX ',VARIN)
+         CALL RDPAR_ERR('STPMAX',VARIN)
       ELSEIF (HC(1:6) .EQ.'STPINF') THEN
          STPINF=VARIN
-         CALL RDPAR_ERR('STPINF ',VARIN)
+         CALL RDPAR_ERR('STPINF',VARIN)
       ELSEIF (HC(1:6) .EQ.'BITACC') THEN
          BITACC=VARIN
       ELSEIF (HC(1:10).EQ.'ERRBINSTOP') THEN
@@ -2176,23 +2176,19 @@
 C---- ------------------------------------------------------------------
 C---- 
 C---- ------------------------------------------------------------------
-      IF     (CHAR_RD(1:6) .EQ. 'NUMIN ' .AND.
-     +        NUMIN .GT. NUMIN_MAX) THEN
+      IF     (CHAR_RD .EQ. 'NUMIN' .AND. NUMIN .GT. NUMIN_MAX) THEN
          WRITE(6,'(A,T10,A,I8,A,I8)')'***',
      +        'RDPAR_ERR: NUMIN read=',NUMIN,' NUMIN_MAX=',NUMIN_MAX
          STOP '*** RDPAR_ERR: left due to error in RDPAR_I'
-      ELSEIF (CHAR_RD(1:7) .EQ. 'NUMHID ' .AND.
-     +        NUMHID .GT. NUMHID_MAX) THEN
+      ELSEIF (CHAR_RD .EQ. 'NUMHID' .AND. NUMHID .GT. NUMHID_MAX) THEN
          WRITE(6,'(A,T10,A,I8,A,I8)')'***',
      +        'RDPAR_ERR: NUMHID read=',NUMHID,' NUMHID_MAX=',NUMHID_MAX
          STOP '*** RDPAR_ERR: left due to error in RDPAR_I'
-      ELSEIF (CHAR_RD(1:7) .EQ. 'NUMOUT ' .AND.
-     +        NUMOUT .GT. NUMOUT_MAX) THEN
+      ELSEIF (CHAR_RD .EQ. 'NUMOUT' .AND. NUMOUT .GT. NUMOUT_MAX) THEN
          WRITE(6,'(A,T10,A,I8,A,I8)')'***',
      +        'RDPAR_ERR: NUMOUT read=',NUMOUT,' NUMOUT_MAX=',NUMOUT_MAX
          STOP '*** RDPAR_ERR: left due to error in RDPAR_I'
-      ELSEIF (CHAR_RD(1:7) .EQ. 'NUMSAM ' .AND.
-     +        NUMSAM .GT. NUMSAM_MAX) THEN
+      ELSEIF (CHAR_RD .EQ. 'NUMSAM' .AND. NUMSAM .GT. NUMSAM_MAX) THEN
          WRITE(6,'(A,T10,A,I8,A,I8)')'***',
      +        'RDPAR_ERR: NUMSAM read=',NUMSAM,' NUMSAM_MAX=',NUMSAM_MAX
          STOP '*** RDPAR_ERR: left due to error in RDPAR_I'
diff -ruN -x '.*.swp' -x 'profnet*' -x .svn src/profPar.f norsnet_dir/profPar.f
--- src/profPar.f	2010-02-23 10:17:25.315661972 +0100
+++ norsnet_dir/profPar.f	2010-02-23 10:38:31.379648791 +0100
@@ -30,17 +30,17 @@
 
 C lkajan: Tune these to the particular network in question - understand
 C lkajan: what it needs.
-C lkajan: The below numbers are the values used by prof as in
-C lkajan: prof{sec,acc}:
-      PARAMETER    (NUMIN_MAX=          800)
-C lkajan: The below number of 10000 is suitable for a method that
-C lkajan: presents a sample for each amino acids of a protein because
-C lkajan: we do not encounter a protein longer than 10000AA very often.
-      PARAMETER    (NUMSAM_MAX=       10000)
-      PARAMETER    (NUMHID_MAX=         100)
-      PARAMETER    (NUMOUT_MAX=          10)
-      PARAMETER    (NUMFILES_MAX=         2)
-      PARAMETER    (STPSWPMAX_MAX=        5)
+      PARAMETER    (NUMIN_MAX=          194)
+C lkajan: We need the big number for NUMSAM_MAX to make up for the
+C lkajan: under-defined NUMIN_MAX (194 instead of 416).
+C lkajan: Same for NUMHID_MAX.
+C lkajan:      PARAMETER    (NUMSAM_MAX=      822700)
+      PARAMETER    (NUMSAM_MAX=       40000)
+      PARAMETER    (NUMHID_MAX=         500)
+      PARAMETER    (NUMOUT_MAX=           2)
+      PARAMETER    (NUMFILES_MAX=       336)
+      PARAMETER    (STPSWPMAX_MAX=      200)
+C lkajan:      PARAMETER    (STPMAX_MAX=    99999999)
 C lkajan: STPMAX_MAX somehow controls the number of input vectors that can
 C lkajan: be evaluated in one go.  There is a simple integer array that gets
 C lkajan: allocated to STPMAX_MAX size.