Révision 302 ETSN/MyDFT_10.py

MyDFT_10.py (revision 302)
398 398

  
399 399
    
400 400
        
401
    # a_np = np.ones(SIZE).astype(np.float32)
402
    # b_np = np.ones(SIZE).astype(np.float32)
403
    a_np = np.random.rand(SIZE).astype(np.float32)
404
    b_np = np.random.rand(SIZE).astype(np.float32)
401
    a_np = np.ones(SIZE).astype(np.float32)
402
    b_np = np.ones(SIZE).astype(np.float32)
403
    # a_np = np.random.rand(SIZE).astype(np.float32)
404
    # b_np = np.random.rand(SIZE).astype(np.float32)
405 405

  
406 406
    C_np = np.zeros(SIZE).astype(np.float32)
407 407
    D_np = np.zeros(SIZE).astype(np.float32)
......
486 486
        print("Precision: ",np.linalg.norm(i_np-C_np),
487 487
              np.linalg.norm(j_np-D_np)) 
488 488
    
489
<<<<<<< .mine
490 489
    if OpenCLMethod and NumpyFFTMethod:
491 490
        print(OpenCLMethod,NumpyFFTMethod)
492 491
        print("Precision: ",np.linalg.norm(m_np-i_np),
......
535 534
        print(m_np,n_np) 
536 535
        print((g_np-m_np),(h_np-n_np)) 
537 536
        
538
||||||| .r292
539
=======
540 537
    if OpenCLFFTMethod and NumpyFFTMethod:
541 538
        print("NumpyOpenCLRatio: %f" % (OpenCLFFTRate/NumpyFFTRate))
542
>>>>>>> .r299

Formats disponibles : Unified diff