Changeset 2366 in Sophya for trunk/Eval

Timestamp:

Apr 18, 2003, 5:48:16 PM (22 years ago)

Author:

ansari

Message:

Ajout fonctions Sin/Cos/... ds jet.h + prog en f90 - Reza 18/4/2003

Location:

trunk/Eval/JET

Files:

• cmds.list (modified) (1 diff)
• f90mtx.f90 (added)
• fmtx.f (modified) (3 diffs)
• jet.h (modified) (2 diffs)
• tjet.cc (modified) (5 diffs)

trunk/Eval/JET/cmds.list

@@ -4 +4 @@
 f90 -o fmtx -fast -arch host fmtx.f ftim.o -lcxml -lm
 
+
+#  Commande pour reconstruction du programme, avec differentes options 
+f90 -O -o cool_fmtx fmtx.f ftim.o -lcxml
+f90 -o f90mtx f90mtx.f90 ftim.o
+

trunk/Eval/JET/fmtx.f

@@ -47 +47 @@
       CALL FPrtTim(4)
 
+      DO K=1,NTIME
+        C1 = K*0.135
+        C2 = COS(6.*C1)+0.04
+        C3 = SIN(C1*8.5)
+        CALL OPEFMTX(K, MX1, MX2, MX5, C1, C2, C3)
+      ENDDO
+      PRINT *, 'FIN  MX5 = C1*MX1 + MX3 + COS(C2*MX2*MX1) ' 
+      CALL FPrtTim(5)
+
       PRINT *, ' ------ FIN programme ---------- ' 
       END
@@ -82 +91 @@
       END
 
+      SUBROUTINE OPEFMTX(K, MX1, MX2, MX5, C1, C2, C3)
+      INTEGER I,J,K
+      DOUBLE PRECISION MX1(1000,500), MX2(1000,500)
+      DOUBLE PRECISION MX5(1000,500)
+      DOUBLE PRECISION C1,C2,C3
+      DO I=1,1000
+         DO J=1,500
+            MX5(I,J) = C1*MX1(I,J)+MX2(I,J)+
+     +                 C3*COS(C2*MX2(I,J)*MX1(I,J))
+         ENDDO
+      ENDDO
+      IF (K.EQ.5) PRINT *, 'OPEFMTX/COS - 5 -> ', MX5(20,5)
+      IF (K.EQ.15) PRINT *, 'OPEFMTX/COS - 15 -> ', MX5(20,15)
+      RETURN
+      END
+
       SUBROUTINE OPADDMTX(K, MX1, MX2, MX3, MX5, C1, C2, C3)
       INTEGER I,J,K
@@ -104 +129 @@
       DOUBLE PRECISION C1,C2,C3
       NTOT = 1000*500
-      CALL DVCAL(NTOT, C1, MX1, 1, MX5, 1)
-      CALL DZAXPY(NTOT, C2, MX2, 1, MX5, 1, MX4, 1)
-      CALL DZAXPY(NTOT, C3, MX3, 1, MX4, 1, MX5, 1)
+C  Sur OSF :
+C      CALL DVCAL(NTOT, C1, MX1, 1, MX5, 1)
+C      CALL DZAXPY(NTOT, C2, MX2, 1, MX5, 1, MX4, 1)
+C      CALL DZAXPY(NTOT, C3, MX3, 1, MX4, 1, MX5, 1)
+C  Sinon 
+      CALL DCOPY(NTOT, MX1, 1, MX5, 1)
+      CALL DSCAL(NTOT, C1, MX5, 1)
+      CALL DAXPY(NTOT, C2, MX2, 1, MX5, 1)
+      CALL DAXPY(NTOT, C3, MX3, 1, MX3, 1)
       IF (K.EQ.5) PRINT *, 'MTXBLAS - 5 -> ', MX5(20,5),
      + ' NTot=' , NTOT

trunk/Eval/JET/jet.h

@@ -132 +132 @@
 };
 
+// -------- Classe Fonc(Expression)  --------------
+template <class T> 
+class FSin {
+public:
+  FSin() { }
+  FSin(FSin<T> const &) { }
+  inline T FuncVal(T x) const { return sin(x); }
+};
+template <class T> 
+class FCos {
+public:
+  FCos() { }
+  FCos(FCos<T> const &) { }
+  inline T FuncVal(T x) const { return cos(x); }
+};
+template <class T> 
+class FTan {
+public:
+  FTan() { }
+  FTan(FTan<T> const &) { }
+  inline T FuncVal(T x) const { return tan(x); }
+};
+template <class T> 
+class FLog {
+public:
+  FLog() { }
+  FLog(FLog<T> const &) { }
+  inline T FuncVal(T x) const { return log(x); }
+};
+template <class T> 
+class FExp {
+public:
+  FExp() { }
+  FExp(FExp<T> const &) { }
+  inline T FuncVal(T x) const { return exp(x); }
+};
+
+template <class T, class E, class F>
+class JETExprFunc {
+public:
+  JETExprFunc(E e, F f) : e_(e), f_(f) { }
+  JETExprFunc( JETExprFunc<T, E, F> const & a) : e_(a.e_), f_(a.f_) { }
+  inline T EvaluateAndStep() const { return f_.FuncVal(e_.EvaluateAndStep()); }
+  virtual MtxSize const & RefSize() const { return e_.RefSize() ; }
+  inline void Reset() const { e_.Reset(); }
+protected:
+  E e_;
+  F f_;
+};
 
 
@@ -174 +223 @@
   (JETExprMult<T,E1,E2>(e1.Expression(), e2.Expression()) ); }
 
+//---- Definition Sin/Cos/Tan/Log/Exp 
+template <class T, class E> 
+JETExpression< T, JETExprFunc<T,E,FSin<T> > > Sin ( JETExpression<T,E> e) 
+{ return JETExpression< T, JETExprFunc<T,E,FSin<T> > > (JETExprFunc<T,E,FSin<T> >(e.Expression(), FSin<T>() ) ); }
 #endif
 

trunk/Eval/JET/tjet.cc

@@ -90 +90 @@
         }
     }
+
     cout << " (1) Element access done ---" << endl;
     PrtTim(" (1) -- ");
@@ -137 +138 @@
     cout << " (5) JET: m5 = m1*c1 + m1*(m2+c2) + m2*c3 ---" << endl;
     PrtTim(" (5) -- ");
-    }
+
+    for(k=0; k<N; k++) {
+      double c1 = frand01() + 1.2;
+      double c2 = frand01() + 3.5;
+      double c3 = frand01() + 6.7;
+    // Calcul m1*c1 + m1*(m2+c2) + m2*c3; 
+      m5 = m1*c1 + m2 + c2*Sin(c3*m3+m1);
+    }
+    cout << " (6) JET: m5 = m1*c1 + m2 + c2*Sin(c3*m3+m1) ---" << endl;
+    PrtTim(" (6) -- ");
+
+    }
+
+    
     // Test avec les TArray / TMatrix
     {
@@ -156 +170 @@
         }
     }
-    cout << " (6) Element access done ---" << endl;
-    PrtTim(" (6) -- ");
+    cout << " (21) Element access done ---" << endl;
+    PrtTim(" (21) -- ");
     // Calcul m1*c1 + m2*c2 + m3*c3;
     for(k=0; k<N; k++) {
@@ -169 +183 @@
       m5.AddElt(m4);
     }
-    cout << " (7) Add/MulElt/Cst m1*c1 + m2*c2 + m3*c3 done ---" << endl;
-    PrtTim(" (7) -- ");
+    cout << " (22) Add/MulElt/Cst m1*c1 + m2*c2 + m3*c3 done ---" << endl;
+    PrtTim(" (22) -- ");
 
     for(k=0; k<N; k++) {
@@ -178 +192 @@
       m5 = m1*c1+m2*c2+m3*c3;
     }
-    cout << " (8) m1*c1 + m2*c2 + m3*c3 done ---" << endl;
-    PrtTim(" (8) -- ");
+    cout << " (23) m1*c1 + m2*c2 + m3*c3 done ---" << endl;
+    PrtTim(" (23) -- ");
+
+    for(k=0; k<N; k++) {
+      double c1 = frand01() + 1.2;
+      double c2 = frand01() + 3.5;
+      double c3 = frand01() + 6.7;
+      m5 = m1*c1 + m2 + c2*Sin(c3*m3+m1);
+    }
+    cout << " (26) m5 = m1*c1 + m2 + c2*Sin(c3*m3+m1) ---" << endl;
+    PrtTim(" (26) -- ");
+
     }
   }